Merge pull request #56 from PureStake/crystalin-fix-wasm-builder

Test to fix wasm_builder 2.0.0
moonbeam-foundation · Oct 10, 2020 · 7ab99f9 · 7ab99f9
2 parents bf61e82 + e6934b5
commit 7ab99f9
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 15 deletions.
diff --git a/node/parachain/src/chain_spec.rs b/node/parachain/src/chain_spec.rs
@@ -63,13 +63,15 @@ where
 	AccountPublic::from(get_from_seed::<TPublic>(seed)).into_account()
 }
 
-pub fn get_chain_spec(id: ParaId) -> ChainSpec {
-	ChainSpec::from_genesis(
+pub fn get_chain_spec(id: ParaId) -> Result<ChainSpec, String> {
+	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;
+	Ok(ChainSpec::from_genesis(
 		"Moonbase Parachain Local Testnet",
 		"local_testnet",
 		ChainType::Local,
 		move || {
 			testnet_genesis(
+				wasm_binary,
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
 				vec![
 					get_account_id_from_seed::<sr25519::Public>("Alice"),
@@ -96,16 +98,18 @@ pub fn get_chain_spec(id: ParaId) -> ChainSpec {
 			relay_chain: "local_testnet".into(),
 			para_id: id.into(),
 		},
-	)
+	))
 }
 
-pub fn staging_test_net(id: ParaId) -> ChainSpec {
-	ChainSpec::from_genesis(
+pub fn staging_test_net(id: ParaId) -> Result<ChainSpec, String> {
+	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;
+	Ok(ChainSpec::from_genesis(
 		"Moonbase Parachain Testnet",
 		"staging_testnet",
 		ChainType::Live,
 		move || {
 			testnet_genesis(
+				wasm_binary,
 				get_account_id_from_seed::<sr25519::Public>("Alice"),
 				vec![get_account_id_from_seed::<sr25519::Public>("Alice")],
 				id,
@@ -119,17 +123,18 @@ pub fn staging_test_net(id: ParaId) -> ChainSpec {
 			relay_chain: "rococo_local_testnet".into(),
 			para_id: id.into(),
 		},
-	)
+	))
 }
 
 fn testnet_genesis(
+	wasm_binary: &[u8],
 	root_key: AccountId,
 	endowed_accounts: Vec<AccountId>,
 	id: ParaId,
 ) -> GenesisConfig {
 	GenesisConfig {
 		frame_system: Some(SystemConfig {
-			code: WASM_BINARY.to_vec(),
+			code: wasm_binary.to_vec(),
 			changes_trie_config: Default::default(),
 		}),
 		pallet_balances: Some(BalancesConfig {

diff --git a/node/parachain/src/command.rs b/node/parachain/src/command.rs
@@ -64,17 +64,17 @@ impl SubstrateCli for Cli {
 	}
 
 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
-		match id {
-			"staging" => Ok(Box::new(chain_spec::staging_test_net(
+		Ok(match id {
+			"staging" => Box::new(chain_spec::staging_test_net(
 				self.run.parachain_id.unwrap_or(200).into(),
-			))),
-			"" => Ok(Box::new(chain_spec::get_chain_spec(
+			)?),
+			"" => Box::new(chain_spec::get_chain_spec(
 				self.run.parachain_id.unwrap_or(200).into(),
-			))),
-			path => Ok(Box::new(chain_spec::ChainSpec::from_json_file(
+			)?),
+			path => Box::new(chain_spec::ChainSpec::from_json_file(
 				path.into(),
-			)?)),
-		}
+			)?),
+		})
 	}
 
 	fn native_runtime_version(_: &Box<dyn ChainSpec>) -> &'static RuntimeVersion {