From c689fcb850fce8a098a597baf6c8c978fa5eb7df Mon Sep 17 00:00:00 2001 From: Ross Bulat Date: Mon, 15 May 2023 12:18:16 +0700 Subject: [PATCH] Merge branch 'master' of https://github.com/paritytech/polkadot --- node/service/src/chain_spec.rs | 12 ++++++------ node/test/service/src/chain_spec.rs | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/node/service/src/chain_spec.rs b/node/service/src/chain_spec.rs index 431af1ec06b6..a63f16dcb97b 100644 --- a/node/service/src/chain_spec.rs +++ b/node/service/src/chain_spec.rs @@ -355,7 +355,7 @@ fn polkadot_staging_testnet_config_genesis(wasm_binary: &[u8]) -> polkadot::Gene minimum_validator_count: 4, stakers: initial_authorities .iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, polkadot::StakerStatus::Validator)) + .map(|x| (x.0.clone(), x.0.clone(), STASH, polkadot::StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::ForceNone, @@ -546,7 +546,7 @@ fn westend_staging_testnet_config_genesis(wasm_binary: &[u8]) -> westend::Genesi minimum_validator_count: 4, stakers: initial_authorities .iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, westend::StakerStatus::Validator)) + .map(|x| (x.0.clone(), x.0.clone(), STASH, westend::StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::ForceNone, @@ -736,7 +736,7 @@ fn kusama_staging_testnet_config_genesis(wasm_binary: &[u8]) -> kusama::GenesisC minimum_validator_count: 4, stakers: initial_authorities .iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, kusama::StakerStatus::Validator)) + .map(|x| (x.0.clone(), x.0.clone(), STASH, kusama::StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::ForceNone, @@ -1340,7 +1340,7 @@ pub fn polkadot_testnet_genesis( validator_count: initial_authorities.len() as u32, stakers: initial_authorities .iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, polkadot::StakerStatus::Validator)) + .map(|x| (x.0.clone(), x.0.clone(), STASH, polkadot::StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::NotForcing, @@ -1427,7 +1427,7 @@ pub fn kusama_testnet_genesis( validator_count: initial_authorities.len() as u32, stakers: initial_authorities .iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, kusama::StakerStatus::Validator)) + .map(|x| (x.0.clone(), x.0.clone(), STASH, kusama::StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::NotForcing, @@ -1507,7 +1507,7 @@ pub fn westend_testnet_genesis( validator_count: initial_authorities.len() as u32, stakers: initial_authorities .iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, westend::StakerStatus::Validator)) + .map(|x| (x.0.clone(), x.0.clone(), STASH, westend::StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::NotForcing, diff --git a/node/test/service/src/chain_spec.rs b/node/test/service/src/chain_spec.rs index 2c6d95260df6..943167d96a58 100644 --- a/node/test/service/src/chain_spec.rs +++ b/node/test/service/src/chain_spec.rs @@ -146,7 +146,7 @@ fn polkadot_testnet_genesis( validator_count: 2, stakers: initial_authorities .iter() - .map(|x| (x.0.clone(), x.1.clone(), STASH, runtime::StakerStatus::Validator)) + .map(|x| (x.0.clone(), x.0.clone(), STASH, runtime::StakerStatus::Validator)) .collect(), invulnerables: initial_authorities.iter().map(|x| x.0.clone()).collect(), force_era: Forcing::NotForcing,