pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-05-30 05:51:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

update substrate/polkadot with construct_runtime changes (#485)

Browse Source 
* update substrate/polkadot with construct_runtime changes

* fix update

* Fixes

* More fixes

* fix test, but might be wrong fix

Co-authored-by: Bastian Köcher <info@kchr.de>
This commit is contained in:
Guillaume Thiolliere
2021-06-10 17:50:09 +02:00
committed by GitHub
parent 8373f510cf
commit b36e4dbca5
6 changed files with 444 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/Cargo.lock
Generated
+400 -281
View File
File diff suppressed because it is too large Load Diff
cumulus/pallets/parachain-system/src/tests.rs
+2 -2
View File
@@ -421,7 +421,7 @@ fn events() {
let events = System::events(); let events = System::events();
assert_eq!( assert_eq!(
events[0].event, events[0].event,
Event::parachain_system(crate::Event::ValidationFunctionStored(1123).into()) Event::ParachainSystem(crate::Event::ValidationFunctionStored(1123).into())
); );
}, },
) )
@@ -432,7 +432,7 @@ fn events() {
let events = System::events(); let events = System::events();
assert_eq!( assert_eq!(
events[0].event, events[0].event,
Event::parachain_system(crate::Event::ValidationFunctionApplied(1234).into()) Event::ParachainSystem(crate::Event::ValidationFunctionApplied(1234).into())
); );
}, },
); );
cumulus/polkadot-parachains/src/chain_spec.rs
+34 -34
View File
@@ -96,7 +96,7 @@ pub fn get_chain_spec(id: ParaId) -> ChainSpec {
None, None,
None, None,
Extensions { Extensions {
relay_chain: "westend-dev".into(), relay_chain: "westend".into(),
para_id: id.into(), para_id: id.into(),
}, },
) )
@@ -113,7 +113,7 @@ pub fn get_shell_chain_spec(id: ParaId) -> ShellChainSpec {
None, None,
None, None,
Extensions { Extensions {
relay_chain: "westend-dev".into(), relay_chain: "westend".into(),
para_id: id.into(), para_id: id.into(),
}, },
) )
@@ -146,7 +146,7 @@ pub fn staging_test_net(id: ParaId) -> ChainSpec {
None, None,
None, None,
Extensions { Extensions {
relay_chain: "westend-dev".into(), relay_chain: "westend".into(),
para_id: id.into(), para_id: id.into(),
}, },
) )
@@ -159,39 +159,39 @@ fn testnet_genesis(
id: ParaId, id: ParaId,
) -> rococo_parachain_runtime::GenesisConfig { ) -> rococo_parachain_runtime::GenesisConfig {
rococo_parachain_runtime::GenesisConfig { rococo_parachain_runtime::GenesisConfig {
frame_system: rococo_parachain_runtime::SystemConfig { system: rococo_parachain_runtime::SystemConfig {
code: rococo_parachain_runtime::WASM_BINARY code: rococo_parachain_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!") .expect("WASM binary was not build, please build it!")
.to_vec(), .to_vec(),
changes_trie_config: Default::default(), changes_trie_config: Default::default(),
}, },
pallet_balances: rococo_parachain_runtime::BalancesConfig { balances: rococo_parachain_runtime::BalancesConfig {
balances: endowed_accounts balances: endowed_accounts
.iter() .iter()
.cloned() .cloned()
.map(|k| (k, 1 << 60)) .map(|k| (k, 1 << 60))
.collect(), .collect(),
}, },
pallet_sudo: rococo_parachain_runtime::SudoConfig { key: root_key }, sudo: rococo_parachain_runtime::SudoConfig { key: root_key },
parachain_info: rococo_parachain_runtime::ParachainInfoConfig { parachain_id: id }, parachain_info: rococo_parachain_runtime::ParachainInfoConfig { parachain_id: id },
pallet_aura: rococo_parachain_runtime::AuraConfig { aura: rococo_parachain_runtime::AuraConfig {
authorities: initial_authorities, authorities: initial_authorities,
}, },
cumulus_pallet_aura_ext: Default::default(), aura_ext: Default::default(),
cumulus_pallet_parachain_system: Default::default(), parachain_system: Default::default(),
} }
} }
fn shell_testnet_genesis(parachain_id: ParaId) -> shell_runtime::GenesisConfig { fn shell_testnet_genesis(parachain_id: ParaId) -> shell_runtime::GenesisConfig {
shell_runtime::GenesisConfig { shell_runtime::GenesisConfig {
frame_system: shell_runtime::SystemConfig { system: shell_runtime::SystemConfig {
code: shell_runtime::WASM_BINARY code: shell_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!") .expect("WASM binary was not build, please build it!")
.to_vec(), .to_vec(),
changes_trie_config: Default::default(), changes_trie_config: Default::default(),
}, },
parachain_info: shell_runtime::ParachainInfoConfig { parachain_id }, parachain_info: shell_runtime::ParachainInfoConfig { parachain_id },
cumulus_pallet_parachain_system: Default::default(), parachain_system: Default::default(),
} }
} }
@@ -338,13 +338,13 @@ fn statemint_genesis(
id: ParaId, id: ParaId,
) -> statemint_runtime::GenesisConfig { ) -> statemint_runtime::GenesisConfig {
statemint_runtime::GenesisConfig { statemint_runtime::GenesisConfig {
frame_system: statemint_runtime::SystemConfig { system: statemint_runtime::SystemConfig {
code: statemint_runtime::WASM_BINARY code: statemint_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!") .expect("WASM binary was not build, please build it!")
.to_vec(), .to_vec(),
changes_trie_config: Default::default(), changes_trie_config: Default::default(),
}, },
pallet_balances: statemint_runtime::BalancesConfig { balances: statemint_runtime::BalancesConfig {
balances: endowed_accounts balances: endowed_accounts
.iter() .iter()
.cloned() .cloned()
@@ -352,12 +352,12 @@ fn statemint_genesis(
.collect(), .collect(),
}, },
parachain_info: statemint_runtime::ParachainInfoConfig { parachain_id: id }, parachain_info: statemint_runtime::ParachainInfoConfig { parachain_id: id },
pallet_collator_selection: statemint_runtime::CollatorSelectionConfig { collator_selection: statemint_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: STATEMINT_ED * 16, candidacy_bond: STATEMINT_ED * 16,
..Default::default() ..Default::default()
}, },
pallet_session: statemint_runtime::SessionConfig { session: statemint_runtime::SessionConfig {
keys: invulnerables.iter().cloned().map(|(acc, aura)| ( keys: invulnerables.iter().cloned().map(|(acc, aura)| (
acc.clone(), // account id acc.clone(), // account id
acc.clone(), // validator id acc.clone(), // validator id
@@ -366,9 +366,9 @@ fn statemint_genesis(
}, },
// no need to pass anything to aura, in fact it will panic if we do. Session will take care // no need to pass anything to aura, in fact it will panic if we do. Session will take care
// of this. // of this.
pallet_aura: Default::default(), aura: Default::default(),
cumulus_pallet_aura_ext: Default::default(), aura_ext: Default::default(),
cumulus_pallet_parachain_system: Default::default(), parachain_system: Default::default(),
} }
} }
@@ -515,13 +515,13 @@ fn statemine_genesis(
id: ParaId, id: ParaId,
) -> statemine_runtime::GenesisConfig { ) -> statemine_runtime::GenesisConfig {
statemine_runtime::GenesisConfig { statemine_runtime::GenesisConfig {
frame_system: statemine_runtime::SystemConfig { system: statemine_runtime::SystemConfig {
code: statemine_runtime::WASM_BINARY code: statemine_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!") .expect("WASM binary was not build, please build it!")
.to_vec(), .to_vec(),
changes_trie_config: Default::default(), changes_trie_config: Default::default(),
}, },
pallet_balances: statemine_runtime::BalancesConfig { balances: statemine_runtime::BalancesConfig {
balances: endowed_accounts balances: endowed_accounts
.iter() .iter()
.cloned() .cloned()
@@ -529,21 +529,21 @@ fn statemine_genesis(
.collect(), .collect(),
}, },
parachain_info: statemine_runtime::ParachainInfoConfig { parachain_id: id }, parachain_info: statemine_runtime::ParachainInfoConfig { parachain_id: id },
pallet_collator_selection: statemine_runtime::CollatorSelectionConfig { collator_selection: statemine_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: STATEMINE_ED * 16, candidacy_bond: STATEMINE_ED * 16,
..Default::default() ..Default::default()
}, },
pallet_session: statemine_runtime::SessionConfig { session: statemine_runtime::SessionConfig {
keys: invulnerables.iter().cloned().map(|(acc, aura)| ( keys: invulnerables.iter().cloned().map(|(acc, aura)| (
acc.clone(), // account id acc.clone(), // account id
acc.clone(), // validator id acc.clone(), // validator id
statemine_session_keys(aura), // session keys statemine_session_keys(aura), // session keys
)).collect() )).collect()
}, },
pallet_aura: Default::default(), aura: Default::default(),
cumulus_pallet_aura_ext: Default::default(), aura_ext: Default::default(),
cumulus_pallet_parachain_system: Default::default(), parachain_system: Default::default(),
} }
} }
@@ -582,7 +582,7 @@ pub fn westmint_development_config(id: ParaId) -> WestmintChainSpec {
None, None,
Some(properties), Some(properties),
Extensions { Extensions {
relay_chain: "westend-dev".into(), relay_chain: "westend".into(),
para_id: id.into(), para_id: id.into(),
}, },
) )
@@ -695,27 +695,27 @@ fn westmint_genesis(
id: ParaId, id: ParaId,
) -> westmint_runtime::GenesisConfig { ) -> westmint_runtime::GenesisConfig {
westmint_runtime::GenesisConfig { westmint_runtime::GenesisConfig {
frame_system: westmint_runtime::SystemConfig { system: westmint_runtime::SystemConfig {
code: westmint_runtime::WASM_BINARY code: westmint_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!") .expect("WASM binary was not build, please build it!")
.to_vec(), .to_vec(),
changes_trie_config: Default::default(), changes_trie_config: Default::default(),
}, },
pallet_balances: westmint_runtime::BalancesConfig { balances: westmint_runtime::BalancesConfig {
balances: endowed_accounts balances: endowed_accounts
.iter() .iter()
.cloned() .cloned()
.map(|k| (k, WESTMINT_ED * 4096)) .map(|k| (k, WESTMINT_ED * 4096))
.collect(), .collect(),
}, },
pallet_sudo: westmint_runtime::SudoConfig { key: root_key }, sudo: westmint_runtime::SudoConfig { key: root_key },
parachain_info: westmint_runtime::ParachainInfoConfig { parachain_id: id }, parachain_info: westmint_runtime::ParachainInfoConfig { parachain_id: id },
pallet_collator_selection: westmint_runtime::CollatorSelectionConfig { collator_selection: westmint_runtime::CollatorSelectionConfig {
invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(), invulnerables: invulnerables.iter().cloned().map(|(acc, _)| acc).collect(),
candidacy_bond: WESTMINT_ED * 16, candidacy_bond: WESTMINT_ED * 16,
..Default::default() ..Default::default()
}, },
pallet_session: westmint_runtime::SessionConfig { session: westmint_runtime::SessionConfig {
keys: invulnerables.iter().cloned().map(|(acc, aura)| ( keys: invulnerables.iter().cloned().map(|(acc, aura)| (
acc.clone(), // account id acc.clone(), // account id
acc.clone(), // validator id acc.clone(), // validator id
@@ -724,8 +724,8 @@ fn westmint_genesis(
}, },
// no need to pass anything to aura, in fact it will panic if we do. Session will take care // no need to pass anything to aura, in fact it will panic if we do. Session will take care
// of this. // of this.
pallet_aura: Default::default(), aura: Default::default(),
cumulus_pallet_aura_ext: Default::default(), aura_ext: Default::default(),
cumulus_pallet_parachain_system: Default::default(), parachain_system: Default::default(),
} }
} }
cumulus/polkadot-parachains/tests/purge_chain_works.rs
+3 -3
View File
@@ -58,7 +58,7 @@ fn purge_chain_works() {
let base_path = run_node_and_stop(); let base_path = run_node_and_stop();
assert!(base_path.path().join("chains/local_testnet/db").exists()); assert!(base_path.path().join("chains/local_testnet/db").exists());
assert!(base_path.path().join("polkadot/chains/westend_dev/db").exists()); assert!(base_path.path().join("polkadot/chains/westend2/db").exists());
let status = Command::new(cargo_bin("polkadot-collator")) let status = Command::new(cargo_bin("polkadot-collator"))
.args(&["purge-chain", "-d"]) .args(&["purge-chain", "-d"])
@@ -71,7 +71,7 @@ fn purge_chain_works() {
// Make sure that the `parachain_local_testnet` chain folder exists, but the `db` is deleted. // Make sure that the `parachain_local_testnet` chain folder exists, but the `db` is deleted.
assert!(base_path.path().join("chains/local_testnet").exists()); assert!(base_path.path().join("chains/local_testnet").exists());
assert!(!base_path.path().join("chains/local_testnet/db").exists()); assert!(!base_path.path().join("chains/local_testnet/db").exists());
assert!(base_path.path().join("polkadot/chains/westend_dev").exists()); assert!(base_path.path().join("polkadot/chains/westend2").exists());
assert!(!base_path.path().join("polkadot/chains/westend_dev/db").exists()); assert!(!base_path.path().join("polkadot/chains/westend2/db").exists());
} }
} }
cumulus/test/service/src/chain_spec.rs
+4 -7
View File
@@ -38,8 +38,6 @@ pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Pu
#[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)] #[derive(Debug, Clone, PartialEq, Serialize, Deserialize, ChainSpecGroup, ChainSpecExtension)]
#[serde(deny_unknown_fields)] #[serde(deny_unknown_fields)]
pub struct Extensions { pub struct Extensions {
/// The relay chain of the Parachain.
pub relay_chain: String,
/// The id of the Parachain. /// The id of the Parachain.
pub para_id: u32, pub para_id: u32,
} }
@@ -73,7 +71,6 @@ pub fn get_chain_spec(id: ParaId) -> ChainSpec {
None, None,
None, None,
Extensions { Extensions {
relay_chain: "westend-dev".into(),
para_id: id.into(), para_id: id.into(),
}, },
) )
@@ -105,20 +102,20 @@ fn testnet_genesis(
endowed_accounts: Vec<AccountId>, endowed_accounts: Vec<AccountId>,
) -> cumulus_test_runtime::GenesisConfig { ) -> cumulus_test_runtime::GenesisConfig {
cumulus_test_runtime::GenesisConfig { cumulus_test_runtime::GenesisConfig {
frame_system: cumulus_test_runtime::SystemConfig { system: cumulus_test_runtime::SystemConfig {
code: cumulus_test_runtime::WASM_BINARY code: cumulus_test_runtime::WASM_BINARY
.expect("WASM binary was not build, please build it!") .expect("WASM binary was not build, please build it!")
.to_vec(), .to_vec(),
..Default::default() ..Default::default()
}, },
cumulus_pallet_parachain_system: Default::default(), parachain_system: Default::default(),
pallet_balances: cumulus_test_runtime::BalancesConfig { balances: cumulus_test_runtime::BalancesConfig {
balances: endowed_accounts balances: endowed_accounts
.iter() .iter()
.cloned() .cloned()
.map(|k| (k, 1 << 60)) .map(|k| (k, 1 << 60))
.collect(), .collect(),
}, },
pallet_sudo: cumulus_test_runtime::SudoConfig { key: root_key }, sudo: cumulus_test_runtime::SudoConfig { key: root_key },
} }
} }
cumulus/test/service/src/lib.rs
+1
View File
@@ -622,6 +622,7 @@ pub fn node_config(
rpc_ws: None, rpc_ws: None,
rpc_ipc: None, rpc_ipc: None,
rpc_ws_max_connections: None, rpc_ws_max_connections: None,
rpc_http_threads: None,
rpc_cors: None, rpc_cors: None,
rpc_methods: Default::default(), rpc_methods: Default::default(),
prometheus_config: None, prometheus_config: None,