adjust genesisconfig addition

paritytech · Dec 1, 2024 · d53d795 · d53d795
1 parent dddac55
commit d53d795
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 38 deletions.
diff --git a/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/assets/asset-hub-rococo/src/genesis_config_presets.rs
@@ -36,8 +36,7 @@ fn asset_hub_rococo_genesis(
 ) -> serde_json::Value {
 	build_struct_json_patch!(RuntimeGenesisConfig {
 		balances: BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, endowment)).collect(),
-			..Default::default()
+			balances: endowed_accounts.iter().cloned().map(|k| (k, endowment)).collect()
 		},
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {

diff --git a/cumulus/parachains/runtimes/assets/asset-hub-westend/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/assets/asset-hub-westend/src/genesis_config_presets.rs
@@ -38,8 +38,7 @@ fn asset_hub_westend_genesis(
 ) -> serde_json::Value {
 	build_struct_json_patch!(RuntimeGenesisConfig {
 		balances: BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, endowment)).collect(),
-			..Default::default()
+			balances: endowed_accounts.iter().cloned().map(|k| (k, endowment)).collect()
 		},
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/genesis_config_presets.rs
@@ -41,8 +41,7 @@ fn bridge_hub_rococo_genesis(
 				.iter()
 				.cloned()
 				.map(|k| (k, 1u128 << 60))
-				.collect::<Vec<_>>(),
-			..Default::default()
+				.collect::<Vec<_>>()
 		},
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {

diff --git a/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/genesis_config_presets.rs
@@ -41,8 +41,7 @@ fn bridge_hub_westend_genesis(
 				.iter()
 				.cloned()
 				.map(|k| (k, 1u128 << 60))
-				.collect::<Vec<_>>(),
-			..Default::default()
+				.collect::<Vec<_>>()
 		},
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {

diff --git a/cumulus/parachains/runtimes/collectives/collectives-westend/src/genesis_config_presets.rs b/cumulus/parachains/runtimes/collectives/collectives-westend/src/genesis_config_presets.rs
@@ -37,8 +37,7 @@ fn collectives_westend_genesis(
 				.iter()
 				.cloned()
 				.map(|k| (k, COLLECTIVES_WESTEND_ED * 4096))
-				.collect::<Vec<_>>(),
-			..Default::default()
+				.collect::<Vec<_>>()
 		},
 		parachain_info: ParachainInfoConfig { parachain_id: id },
 		collator_selection: CollatorSelectionConfig {

diff --git a/cumulus/parachains/runtimes/test-utils/src/lib.rs b/cumulus/parachains/runtimes/test-utils/src/lib.rs
@@ -230,7 +230,7 @@ impl<Runtime: BasicParachainRuntime> ExtBuilder<Runtime> {
 			.unwrap();
 		}
 
-		pallet_balances::GenesisConfig::<Runtime> { balances: self.balances, ..Default::default() }
+		pallet_balances::GenesisConfig::<Runtime> { balances: self.balances }
 			.assimilate_storage(&mut t)
 			.unwrap();
 

diff --git a/polkadot/runtime/rococo/src/genesis_config_presets.rs b/polkadot/runtime/rococo/src/genesis_config_presets.rs
@@ -166,8 +166,7 @@ fn rococo_testnet_genesis(
 
 	build_struct_json_patch!(RuntimeGenesisConfig {
 		balances: BalancesConfig {
-			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect::<Vec<_>>(),
-			..Default::default()
+			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect::<Vec<_>>()
 		},
 		session: SessionConfig {
 			keys: initial_authorities
@@ -428,8 +427,7 @@ fn rococo_staging_testnet_config_genesis() -> serde_json::Value {
 				.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
-				.collect::<Vec<_>>(),
-			..Default::default()
+				.collect::<Vec<_>>()
 		},
 		session: SessionConfig {
 			keys: initial_authorities

diff --git a/polkadot/runtime/westend/src/genesis_config_presets.rs b/polkadot/runtime/westend/src/genesis_config_presets.rs
@@ -173,8 +173,7 @@ fn westend_testnet_genesis(
 
 	build_struct_json_patch!(RuntimeGenesisConfig {
 		balances: BalancesConfig {
-			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect::<Vec<_>>(),
-			..Default::default()
+			balances: endowed_accounts.iter().map(|k| (k.clone(), ENDOWMENT)).collect::<Vec<_>>()
 		},
 		session: SessionConfig {
 			keys: initial_authorities
@@ -345,8 +344,7 @@ fn westend_staging_testnet_config_genesis() -> serde_json::Value {
 				.iter()
 				.map(|k: &AccountId| (k.clone(), ENDOWMENT))
 				.chain(initial_authorities.iter().map(|x| (x.0.clone(), STASH)))
-				.collect::<Vec<_>>(),
-			..Default::default()
+				.collect::<Vec<_>>()
 		},
 		session: SessionConfig {
 			keys: initial_authorities

diff --git a/prdoc/pr_6267.prdoc b/prdoc/pr_6267.prdoc
@@ -97,6 +97,8 @@ crates:
     bump: minor
   - name: pallet-asset-conversion
     bump: minor
+  - name: pallet-asset-conversion-ops
+    bump: minor
   - name: pallet-alliance
     bump: minor
   - name: node-testing
@@ -111,24 +113,8 @@ crates:
     bump: minor
   - name: pallet-xcm
     bump: minor
-  - name: westend-runtime
-    bump: minor
-  - name: rococo-runtime
-    bump: minor
   - name: polkadot-runtime-common
     bump: minor
-  - name: parachains-runtimes-test-utils
-    bump: minor
-  - name: collectives-westend-runtime
-    bump: minor
-  - name: bridge-hub-westend-runtime
-    bump: minor
-  - name: bridge-hub-rococo-runtime
-    bump: minor
-  - name: asset-hub-westend-runtime
-    bump: minor
-  - name: asset-hub-rococo-runtime
-    bump: minor
   - name: pallet-collator-selection
     bump: minor
   - name: pallet-bridge-messages

diff --git a/substrate/bin/node/testing/src/genesis.rs b/substrate/bin/node/testing/src/genesis.rs
@@ -47,7 +47,7 @@ pub fn config_endowed(extra_endowed: Vec<AccountId>) -> RuntimeGenesisConfig {
 
 	RuntimeGenesisConfig {
 		indices: IndicesConfig { indices: vec![] },
-		balances: BalancesConfig { balances: endowed, ..Default::default() },
+		balances: BalancesConfig { balances: endowed },
 		session: SessionConfig {
 			keys: vec![
 				(alice(), dave(), session_keys_from_seed(Ed25519Keyring::Alice.into())),

diff --git a/substrate/frame/balances/src/lib.rs b/substrate/frame/balances/src/lib.rs
@@ -183,6 +183,7 @@ use sp_runtime::{
 
 #[cfg(feature = "runtime-benchmarks")]
 use sp_core::{sr25519::Pair as SrPair, Pair};
+#[cfg(feature = "runtime-benchmarks")]
 use alloc::{format, string::{String, ToString}};
 
 pub use types::{
@@ -521,7 +522,7 @@ pub mod pallet {
 				balances: Default::default(),
 
 				#[cfg(feature = "runtime-benchmarks")]
-				dev_accounts: (One::one(), <T as Config<I>>::ExistentialDeposit::get(), None),
+				dev_accounts: (One::one(), <T as Config<I>>::ExistentialDeposit::get(), Some("//Sender/{}".to_string())),
 			}
 		}
 	}

diff --git a/substrate/test-utils/runtime/Cargo.toml b/substrate/test-utils/runtime/Cargo.toml
@@ -35,7 +35,7 @@ sp-session = { workspace = true }
 sp-api = { workspace = true }
 sp-runtime = { features = ["serde"], workspace = true }
 pallet-babe = { workspace = true }
-pallet-balances = { workspace = true }
+pallet-balances = { workspace = true, features = ["runtime-benchmarks"] }
 frame-executive = { workspace = true }
 frame-metadata-hash-extension = { workspace = true }
 frame-system = { workspace = true }