bin/node: frame_system::code removed

Author: michalkucharczyk

bin/node/executor/benches/bench.rs

@@ -189,7 +189,7 @@ fn bench_execute_block(c: &mut Criterion) {
 
 	for strategy in execution_methods {
 		group.bench_function(format!("{:?}", strategy), |b| {
-			let genesis_config = node_testing::genesis::config(Some(compact_code_unwrap()));
+			let genesis_config = node_testing::genesis::config();
 			let use_native = match strategy {
 				ExecutionMethod::Native => true,
 				ExecutionMethod::Wasm(..) => false,

bin/node/executor/tests/common.rs

@@ -123,7 +123,7 @@ pub fn executor_call(
 pub fn new_test_ext(code: &[u8]) -> TestExternalities<BlakeTwo256> {
 	let ext = TestExternalities::new_with_code(
 		code,
-		node_testing::genesis::config(Some(code)).build_storage().unwrap(),
+		node_testing::genesis::config().build_storage().unwrap(),
 	);
 	ext
 }

bin/node/testing/src/bench.rs

@@ -587,10 +587,7 @@ impl BenchKeyring {
 
 	/// Generate genesis with accounts from this keyring endowed with some balance.
 	pub fn generate_genesis(&self) -> kitchensink_runtime::RuntimeGenesisConfig {
-		crate::genesis::config_endowed(
-			Some(kitchensink_runtime::wasm_binary_unwrap()),
-			self.collect_account_ids(),
-		)
+		crate::genesis::config_endowed(self.collect_account_ids())
 	}
 }
 

bin/node/testing/src/client.rs

@@ -45,7 +45,7 @@ pub struct GenesisParameters;
 
 impl substrate_test_client::GenesisInit for GenesisParameters {
 	fn genesis_storage(&self) -> Storage {
-		crate::genesis::config(None).build_storage().unwrap()
+		crate::genesis::config().build_storage().unwrap()
 	}
 }
 

bin/node/testing/src/genesis.rs

@@ -29,13 +29,13 @@ use sp_keyring::{Ed25519Keyring, Sr25519Keyring};
 use sp_runtime::Perbill;
 
 /// Create genesis runtime configuration for tests.
-pub fn config(code: Option<&[u8]>) -> RuntimeGenesisConfig {
-	config_endowed(code, Default::default())
+pub fn config() -> RuntimeGenesisConfig {
+	config_endowed(Default::default())
 }
 
 /// Create genesis runtime configuration for tests with some extra
 /// endowed accounts.
-pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> RuntimeGenesisConfig {
+pub fn config_endowed(extra_endowed: Vec<AccountId>) -> RuntimeGenesisConfig {
 	let mut endowed = vec![
 		(alice(), 111 * DOLLARS),
 		(bob(), 100 * DOLLARS),
@@ -48,10 +48,7 @@ pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> Run
 	endowed.extend(extra_endowed.into_iter().map(|endowed| (endowed, 100 * DOLLARS)));
 
 	RuntimeGenesisConfig {
-		system: SystemConfig {
-			code: code.map(|x| x.to_vec()).unwrap_or_else(|| wasm_binary_unwrap().to_vec()),
-			..Default::default()
-		},
+		system: Default::default(),
 		indices: IndicesConfig { indices: vec![] },
 		balances: BalancesConfig { balances: endowed },
 		session: SessionConfig {