From cad666bf71cae27d54eb61db349978fccdb266b0 Mon Sep 17 00:00:00 2001 From: AlexD10S Date: Wed, 8 May 2024 00:44:04 +0200 Subject: [PATCH] fix: merge --- crates/pop-cli/src/commands/new/parachain.rs | 4 ++-- crates/pop-parachains/src/new_parachain.rs | 2 +- crates/pop-parachains/src/templates.rs | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/crates/pop-cli/src/commands/new/parachain.rs b/crates/pop-cli/src/commands/new/parachain.rs index 6ce3bee8..ba844ba2 100644 --- a/crates/pop-cli/src/commands/new/parachain.rs +++ b/crates/pop-cli/src/commands/new/parachain.rs @@ -347,11 +347,11 @@ mod tests { #[test] fn test_is_template_supported() -> Result<()> { - is_template_supported(&Provider::Pop, &Template::Base)?; + is_template_supported(&Provider::Pop, &Template::Standard)?; assert!(is_template_supported(&Provider::Pop, &Template::ParityContracts).is_err()); assert!(is_template_supported(&Provider::Pop, &Template::ParityFPT).is_err()); - assert!(is_template_supported(&Provider::Parity, &Template::Base).is_err()); + assert!(is_template_supported(&Provider::Parity, &Template::Standard).is_err()); is_template_supported(&Provider::Parity, &Template::ParityContracts)?; is_template_supported(&Provider::Parity, &Template::ParityFPT) } diff --git a/crates/pop-parachains/src/new_parachain.rs b/crates/pop-parachains/src/new_parachain.rs index 7f6d0919..1784d8da 100644 --- a/crates/pop-parachains/src/new_parachain.rs +++ b/crates/pop-parachains/src/new_parachain.rs @@ -80,7 +80,7 @@ mod tests { decimals: 18, initial_endowment: "1000000".to_string(), }; - instantiate_base_template(temp_dir.path(), config, None)?; + instantiate_standard_template(&Template::Standard, temp_dir.path(), config, None)?; Ok(temp_dir) } diff --git a/crates/pop-parachains/src/templates.rs b/crates/pop-parachains/src/templates.rs index c94b6bf5..abde3d55 100644 --- a/crates/pop-parachains/src/templates.rs +++ b/crates/pop-parachains/src/templates.rs @@ -231,7 +231,10 @@ mod tests { #[test] fn test_templates_of_provider() { let mut provider = Provider::Pop; - assert_eq!(provider.templates(), [&Template::Base, &Template::Assets]); + assert_eq!( + provider.templates(), + [&Template::Standard, &Template::Assets, &Template::Contracts, &Template::EVM] + ); provider = Provider::Parity; assert_eq!(provider.templates(), [&Template::ParityContracts, &Template::ParityFPT]); }