GenesisBuild<T,I> deprecated. BuildGenesisConfig added (#2757)

* GenesisBuild<T,I> deprecated. BuildGenesisConfig added

* ".git/.scripts/commands/fmt/fmt.sh"

* integration-tests/emulated: ..Default::default added to genesis configs

* Cargo.lock updated

* Cargo.lock updated

* update lockfile for {"polkadot", "substrate"}

* clippy fixes

* clippy fixes

* clippy fixes again

---------

Co-authored-by: command-bot <>
This commit is contained in:
Michal Kucharczyk
2023-07-12 14:00:17 +02:00
committed by GitHub
parent f3ada7b81f
commit 94d2e4bc28
48 changed files with 511 additions and 394 deletions
@@ -219,6 +219,7 @@ fn asset_hub_polkadot_genesis(
code: asset_hub_polkadot_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: asset_hub_polkadot_runtime::BalancesConfig {
balances: endowed_accounts
@@ -227,7 +228,10 @@ fn asset_hub_polkadot_genesis(
.map(|k| (k, ASSET_HUB_POLKADOT_ED * 4096))
.collect(),
},
parachain_info: asset_hub_polkadot_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: asset_hub_polkadot_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: asset_hub_polkadot_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: ASSET_HUB_POLKADOT_ED * 16,
@@ -252,6 +256,7 @@ fn asset_hub_polkadot_genesis(
parachain_system: Default::default(),
polkadot_xcm: asset_hub_polkadot_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
}
}
@@ -408,6 +413,7 @@ fn asset_hub_kusama_genesis(
code: asset_hub_kusama_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: asset_hub_kusama_runtime::BalancesConfig {
balances: endowed_accounts
@@ -416,7 +422,10 @@ fn asset_hub_kusama_genesis(
.map(|k| (k, ASSET_HUB_KUSAMA_ED * 524_288))
.collect(),
},
parachain_info: asset_hub_kusama_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: asset_hub_kusama_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: asset_hub_kusama_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: ASSET_HUB_KUSAMA_ED * 16,
@@ -439,6 +448,7 @@ fn asset_hub_kusama_genesis(
parachain_system: Default::default(),
polkadot_xcm: asset_hub_kusama_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
}
}
@@ -592,6 +602,7 @@ fn asset_hub_westend_genesis(
code: asset_hub_westend_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: asset_hub_westend_runtime::BalancesConfig {
balances: endowed_accounts
@@ -600,7 +611,10 @@ fn asset_hub_westend_genesis(
.map(|k| (k, ASSET_HUB_WESTEND_ED * 4096))
.collect(),
},
parachain_info: asset_hub_westend_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: asset_hub_westend_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: asset_hub_westend_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: ASSET_HUB_WESTEND_ED * 16,
@@ -625,6 +639,7 @@ fn asset_hub_westend_genesis(
parachain_system: Default::default(),
polkadot_xcm: asset_hub_westend_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
}
}
@@ -274,11 +274,15 @@ pub mod rococo {
code: bridge_hub_rococo_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: bridge_hub_rococo_runtime::BalancesConfig {
balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
},
parachain_info: bridge_hub_rococo_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: bridge_hub_rococo_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: bridge_hub_rococo_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: BRIDGE_HUB_ROCOCO_ED * 16,
@@ -301,6 +305,7 @@ pub mod rococo {
parachain_system: Default::default(),
polkadot_xcm: bridge_hub_rococo_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
bridge_wococo_grandpa: bridge_hub_rococo_runtime::BridgeWococoGrandpaConfig {
owner: bridges_pallet_owner.clone(),
@@ -440,6 +445,7 @@ pub mod kusama {
code: bridge_hub_kusama_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: bridge_hub_kusama_runtime::BalancesConfig {
balances: endowed_accounts
@@ -448,7 +454,10 @@ pub mod kusama {
.map(|k| (k, BRIDGE_HUB_KUSAMA_ED * 524_288))
.collect(),
},
parachain_info: bridge_hub_kusama_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: bridge_hub_kusama_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: bridge_hub_kusama_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: BRIDGE_HUB_KUSAMA_ED * 16,
@@ -471,6 +480,7 @@ pub mod kusama {
parachain_system: Default::default(),
polkadot_xcm: bridge_hub_kusama_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
}
}
@@ -572,6 +582,7 @@ pub mod polkadot {
code: bridge_hub_polkadot_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: bridge_hub_polkadot_runtime::BalancesConfig {
balances: endowed_accounts
@@ -580,7 +591,10 @@ pub mod polkadot {
.map(|k| (k, BRIDGE_HUB_POLKADOT_ED * 4096))
.collect(),
},
parachain_info: bridge_hub_polkadot_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: bridge_hub_polkadot_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: bridge_hub_polkadot_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: BRIDGE_HUB_POLKADOT_ED * 16,
@@ -603,6 +617,7 @@ pub mod polkadot {
parachain_system: Default::default(),
polkadot_xcm: bridge_hub_polkadot_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
}
}
@@ -138,6 +138,7 @@ fn collectives_polkadot_genesis(
code: collectives_polkadot_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: collectives_polkadot_runtime::BalancesConfig {
balances: endowed_accounts
@@ -146,7 +147,10 @@ fn collectives_polkadot_genesis(
.map(|k| (k, COLLECTIVES_POLKADOT_ED * 4096))
.collect(),
},
parachain_info: collectives_polkadot_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: collectives_polkadot_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: collectives_polkadot_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: COLLECTIVES_POLKADOT_ED * 16,
@@ -171,6 +175,7 @@ fn collectives_polkadot_genesis(
parachain_system: Default::default(),
polkadot_xcm: collectives_polkadot_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
alliance: Default::default(),
alliance_motion: Default::default(),
@@ -240,11 +240,15 @@ fn contracts_rococo_genesis(
code: contracts_rococo_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: contracts_rococo_runtime::BalancesConfig {
balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
},
parachain_info: contracts_rococo_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: contracts_rococo_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: contracts_rococo_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: CONTRACTS_ROCOCO_ED * 16,
@@ -269,6 +273,7 @@ fn contracts_rococo_genesis(
parachain_system: Default::default(),
polkadot_xcm: contracts_rococo_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
sudo: contracts_rococo_runtime::SudoConfig {
key: Some(
@@ -84,13 +84,15 @@ fn glutton_genesis(parachain_id: ParaId) -> glutton_runtime::RuntimeGenesisConfi
code: glutton_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
parachain_info: glutton_runtime::ParachainInfoConfig { parachain_id },
parachain_info: glutton_runtime::ParachainInfoConfig { parachain_id, ..Default::default() },
parachain_system: Default::default(),
glutton: glutton_runtime::GluttonConfig {
compute: Default::default(),
storage: Default::default(),
trash_data_count: Default::default(),
..Default::default()
},
sudo: glutton_runtime::SudoConfig {
key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
@@ -90,6 +90,7 @@ fn penpal_testnet_genesis(
code: penpal_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: penpal_runtime::BalancesConfig {
balances: endowed_accounts
@@ -98,7 +99,10 @@ fn penpal_testnet_genesis(
.map(|k| (k, penpal_runtime::EXISTENTIAL_DEPOSIT * 4096))
.collect(),
},
parachain_info: penpal_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: penpal_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
collator_selection: penpal_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: penpal_runtime::EXISTENTIAL_DEPOSIT * 16,
@@ -123,6 +127,7 @@ fn penpal_testnet_genesis(
parachain_system: Default::default(),
polkadot_xcm: penpal_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
sudo: penpal_runtime::SudoConfig {
key: Some(get_account_id_from_seed::<sr25519::Public>("Alice")),
@@ -105,17 +105,22 @@ pub(crate) fn testnet_genesis(
code: rococo_parachain_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
balances: rococo_parachain_runtime::BalancesConfig {
balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
},
sudo: rococo_parachain_runtime::SudoConfig { key: Some(root_key) },
parachain_info: rococo_parachain_runtime::ParachainInfoConfig { parachain_id: id },
parachain_info: rococo_parachain_runtime::ParachainInfoConfig {
parachain_id: id,
..Default::default()
},
aura: rococo_parachain_runtime::AuraConfig { authorities: initial_authorities },
aura_ext: Default::default(),
parachain_system: Default::default(),
polkadot_xcm: rococo_parachain_runtime::PolkadotXcmConfig {
safe_xcm_version: Some(SAFE_XCM_VERSION),
..Default::default()
},
}
}
@@ -53,9 +53,13 @@ fn seedling_testnet_genesis(
code: seedling_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
sudo: seedling_runtime::SudoConfig { key: Some(root_key) },
parachain_info: seedling_runtime::ParachainInfoConfig { parachain_id },
parachain_info: seedling_runtime::ParachainInfoConfig {
parachain_id,
..Default::default()
},
parachain_system: Default::default(),
}
}
@@ -43,8 +43,9 @@ fn shell_testnet_genesis(parachain_id: ParaId) -> shell_runtime::RuntimeGenesisC
code: shell_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!")
.to_vec(),
..Default::default()
},
parachain_info: shell_runtime::ParachainInfoConfig { parachain_id },
parachain_info: shell_runtime::ParachainInfoConfig { parachain_id, ..Default::default() },
parachain_system: Default::default(),
}
}