Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Commit 022f15a

Browse files
michalkucharczykskunertdavxybkchr
authored and
EgorPopelyaev
committed
GenesisBuild<T,I> deprecated. BuildGenesisConfig added. (#14306)
* frame::support: GenesisConfig types for Runtime enabled * frame::support: macro generating GenesisBuild::build for RuntimeGenesisConfig * frame: ambiguity BuildStorage vs GenesisBuild fixed * fix * RuntimeGenesisBuild added * Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed" This reverts commit 6017dad. * Revert "fix" This reverts commit 477d7ad. * Revert "RuntimeGenesisBuild added" This reverts commit 3c131b6. * Revert "Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed"" This reverts commit 2b1ecd4. * Revert "Revert "fix"" This reverts commit fd7fa62. * Code review suggestions * frame: BuildGenesisConfig added, BuildGenesis deprecated * frame: some pallets updated with BuildGenesisConfig * constuct_runtime: support for BuildGenesisConfig * frame::support: genesis_build macro supports BuildGenesisConfig * frame: BuildGenesisConfig added, BuildGenesis deprecated * Cargo.lock update * test-runtime: fixes * Revert "fix" This reverts commit 477d7ad. * Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed" This reverts commit 6017dad. * self review * doc fixed * ui tests fixed * fmt * tests fixed * genesis_build macrto fixed for non-generic GenesisConfig * BuildGenesisConfig constraints added * warning fixed * some duplication removed * fmt * fix * doc tests fix * doc fix * cleanup: remove BuildModuleGenesisStorage * self review comments * fix * Update frame/treasury/src/tests.rs Co-authored-by: Sebastian Kunert <[email protected]> * Update frame/support/src/traits/hooks.rs Co-authored-by: Sebastian Kunert <[email protected]> * doc fix: GenesisBuild exposed * ".git/.scripts/commands/fmt/fmt.sh" * frame: more serde(skip) + cleanup * Update frame/support/src/traits/hooks.rs Co-authored-by: Davide Galassi <[email protected]> * frame: phantom fields moved to the end of structs * chain-spec: Default::default cleanup * test-runtime: phantom at the end * merge master fixes * fix * fix * fix * fix * fix (facepalm) * Update frame/support/procedural/src/pallet/expand/genesis_build.rs Co-authored-by: Bastian Köcher <[email protected]> * fmt * fix * fix --------- Co-authored-by: parity-processbot <> Co-authored-by: Sebastian Kunert <[email protected]> Co-authored-by: Davide Galassi <[email protected]> Co-authored-by: Bastian Köcher <[email protected]>
1 parent d8e48f4 commit 022f15a

File tree

165 files changed

+578
-533
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+578
-533
lines changed

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎bin/node-template/node/src/chain_spec.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ fn testnet_genesis(
136136
system: SystemConfig {
137137
// Add Wasm runtime to storage.
138138
code: wasm_binary.to_vec(),
139+
..Default::default()
139140
},
140141
balances: BalancesConfig {
141142
// Configure endowed accounts with initial balance of 1 << 60.
@@ -146,6 +147,7 @@ fn testnet_genesis(
146147
},
147148
grandpa: GrandpaConfig {
148149
authorities: initial_authorities.iter().map(|x| (x.1.clone(), 1)).collect(),
150+
..Default::default()
149151
},
150152
sudo: SudoConfig {
151153
// Assign network admin rights.

‎bin/node-template/pallets/template/src/mock.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use sp_core::H256;
44
use sp_runtime::{
55
testing::Header,
66
traits::{BlakeTwo256, IdentityLookup},
7+
BuildStorage,
78
};
89

910
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -55,5 +56,5 @@ impl pallet_template::Config for Test {
5556

5657
// Build genesis storage according to the mock runtime.
5758
pub fn new_test_ext() -> sp_io::TestExternalities {
58-
frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
59+
frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
5960
}

‎bin/node/cli/src/chain_spec.rs

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,10 @@
2020
2121
use grandpa_primitives::AuthorityId as GrandpaId;
2222
use kitchensink_runtime::{
23-
constants::currency::*, wasm_binary_unwrap, AuthorityDiscoveryConfig, BabeConfig,
24-
BalancesConfig, Block, CouncilConfig, DemocracyConfig, ElectionsConfig, GluttonConfig,
25-
GrandpaConfig, ImOnlineConfig, IndicesConfig, MaxNominations, NominationPoolsConfig,
26-
SessionConfig, SessionKeys, SocietyConfig, StakerStatus, StakingConfig, SudoConfig,
27-
SystemConfig, TechnicalCommitteeConfig,
23+
constants::currency::*, wasm_binary_unwrap, BabeConfig, BalancesConfig, Block, CouncilConfig,
24+
DemocracyConfig, ElectionsConfig, ImOnlineConfig, IndicesConfig, MaxNominations,
25+
NominationPoolsConfig, SessionConfig, SessionKeys, SocietyConfig, StakerStatus, StakingConfig,
26+
SudoConfig, SystemConfig, TechnicalCommitteeConfig,
2827
};
2928
use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
3029
use sc_chain_spec::ChainSpecExtension;
@@ -295,7 +294,7 @@ pub fn testnet_genesis(
295294
const STASH: Balance = ENDOWMENT / 1000;
296295

297296
RuntimeGenesisConfig {
298-
system: SystemConfig { code: wasm_binary_unwrap().to_vec() },
297+
system: SystemConfig { code: wasm_binary_unwrap().to_vec(), ..Default::default() },
299298
balances: BalancesConfig {
300299
balances: endowed_accounts.iter().cloned().map(|x| (x, ENDOWMENT)).collect(),
301300
},
@@ -340,12 +339,12 @@ pub fn testnet_genesis(
340339
},
341340
sudo: SudoConfig { key: Some(root_key) },
342341
babe: BabeConfig {
343-
authorities: vec![],
344342
epoch_config: Some(kitchensink_runtime::BABE_GENESIS_EPOCH_CONFIG),
343+
..Default::default()
345344
},
346345
im_online: ImOnlineConfig { keys: vec![] },
347-
authority_discovery: AuthorityDiscoveryConfig { keys: vec![] },
348-
grandpa: GrandpaConfig { authorities: vec![] },
346+
authority_discovery: Default::default(),
347+
grandpa: Default::default(),
349348
technical_membership: Default::default(),
350349
treasury: Default::default(),
351350
society: SocietyConfig { pot: 0 },
@@ -365,11 +364,7 @@ pub fn testnet_genesis(
365364
min_join_bond: 1 * DOLLARS,
366365
..Default::default()
367366
},
368-
glutton: GluttonConfig {
369-
compute: Default::default(),
370-
storage: Default::default(),
371-
trash_data_count: Default::default(),
372-
},
367+
glutton: Default::default(),
373368
}
374369
}
375370

‎bin/node/runtime/src/impls.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ mod multiplier_tests {
120120
use sp_runtime::{
121121
assert_eq_error_rate,
122122
traits::{Convert, One, Zero},
123-
FixedPointNumber,
123+
BuildStorage, FixedPointNumber,
124124
};
125125

126126
use crate::{
@@ -197,8 +197,8 @@ mod multiplier_tests {
197197
where
198198
F: Fn() -> (),
199199
{
200-
let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::default()
201-
.build_storage::<Runtime>()
200+
let mut t: sp_io::TestExternalities = frame_system::GenesisConfig::<Runtime>::default()
201+
.build_storage()
202202
.unwrap()
203203
.into();
204204
t.execute_with(|| {

‎bin/node/testing/src/genesis.rs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> Run
5050
RuntimeGenesisConfig {
5151
system: SystemConfig {
5252
code: code.map(|x| x.to_vec()).unwrap_or_else(|| wasm_binary_unwrap().to_vec()),
53+
..Default::default()
5354
},
5455
indices: IndicesConfig { indices: vec![] },
5556
balances: BalancesConfig { balances: endowed },
@@ -76,8 +77,12 @@ pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> Run
7677
invulnerables: vec![alice(), bob(), charlie()],
7778
..Default::default()
7879
},
79-
babe: BabeConfig { authorities: vec![], epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG) },
80-
grandpa: GrandpaConfig { authorities: vec![] },
80+
babe: BabeConfig {
81+
authorities: vec![],
82+
epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG),
83+
..Default::default()
84+
},
85+
grandpa: GrandpaConfig { authorities: vec![], _config: Default::default() },
8186
im_online: Default::default(),
8287
authority_discovery: Default::default(),
8388
democracy: Default::default(),
@@ -100,6 +105,7 @@ pub fn config_endowed(code: Option<&[u8]>, extra_endowed: Vec<AccountId>) -> Run
100105
compute: Default::default(),
101106
storage: Default::default(),
102107
trash_data_count: Default::default(),
108+
..Default::default()
103109
},
104110
}
105111
}

‎frame/alliance/src/lib.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,12 @@ pub mod pallet {
405405
pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
406406
pub fellows: Vec<T::AccountId>,
407407
pub allies: Vec<T::AccountId>,
408+
#[serde(skip)]
408409
pub phantom: PhantomData<(T, I)>,
409410
}
410411

411412
#[pallet::genesis_build]
412-
impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
413+
impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
413414
fn build(&self) {
414415
for m in self.fellows.iter().chain(self.allies.iter()) {
415416
assert!(Pallet::<T, I>::has_identity(m).is_ok(), "Member does not set identity!");

‎frame/alliance/src/mock.rs

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use sp_std::convert::{TryFrom, TryInto};
2828

2929
pub use frame_support::{
3030
assert_noop, assert_ok, ord_parameter_types, parameter_types,
31-
traits::{EitherOfDiverse, GenesisBuild, SortedMembers},
31+
traits::{EitherOfDiverse, SortedMembers},
3232
BoundedVec,
3333
};
3434
use frame_system::{EnsureRoot, EnsureSignedBy};
@@ -256,7 +256,7 @@ frame_support::construct_runtime!(
256256
);
257257

258258
pub fn new_test_ext() -> sp_io::TestExternalities {
259-
let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
259+
let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
260260

261261
pallet_balances::GenesisConfig::<Test> {
262262
balances: vec![
@@ -274,14 +274,12 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
274274
.assimilate_storage(&mut t)
275275
.unwrap();
276276

277-
GenesisBuild::<Test>::assimilate_storage(
278-
&pallet_alliance::GenesisConfig {
279-
fellows: vec![],
280-
allies: vec![],
281-
phantom: Default::default(),
282-
},
283-
&mut t,
284-
)
277+
pallet_alliance::GenesisConfig::<Test> {
278+
fellows: vec![],
279+
allies: vec![],
280+
phantom: Default::default(),
281+
}
282+
.assimilate_storage(&mut t)
285283
.unwrap();
286284

287285
let mut ext = sp_io::TestExternalities::new(t);

‎frame/asset-conversion/src/mock.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ use sp_core::H256;
3333
use sp_runtime::{
3434
testing::Header,
3535
traits::{AccountIdConversion, BlakeTwo256, IdentityLookup},
36+
BuildStorage,
3637
};
37-
3838
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
3939
type Block = frame_system::mocking::MockBlock<Test>;
4040

@@ -183,7 +183,7 @@ impl Config for Test {
183183
}
184184

185185
pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
186-
let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
186+
let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
187187

188188
pallet_balances::GenesisConfig::<Test> {
189189
balances: vec![(1, 10000), (2, 20000), (3, 30000), (4, 40000)],

‎frame/asset-rate/src/mock.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ use sp_core::H256;
2323
use sp_runtime::{
2424
testing::Header,
2525
traits::{BlakeTwo256, IdentityLookup},
26+
BuildStorage,
2627
};
2728

2829
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -96,5 +97,5 @@ impl pallet_asset_rate::Config for Test {
9697

9798
// Build genesis storage according to the mock runtime.
9899
pub fn new_test_ext() -> sp_io::TestExternalities {
99-
frame_system::GenesisConfig::default().build_storage::<Test>().unwrap().into()
100+
frame_system::GenesisConfig::<Test>::default().build_storage().unwrap().into()
100101
}

‎frame/assets/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ pub mod pallet {
380380
}
381381

382382
#[pallet::genesis_build]
383-
impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
383+
impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
384384
fn build(&self) {
385385
for (id, owner, is_sufficient, min_balance) in &self.assets {
386386
assert!(!Asset::<T, I>::contains_key(id), "Asset id already in use");

‎frame/assets/src/mock.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,14 @@ use crate as pallet_assets;
2323
use codec::Encode;
2424
use frame_support::{
2525
construct_runtime, parameter_types,
26-
traits::{AsEnsureOriginWithArg, ConstU32, ConstU64, GenesisBuild},
26+
traits::{AsEnsureOriginWithArg, ConstU32, ConstU64},
2727
};
2828
use sp_core::H256;
2929
use sp_io::storage;
3030
use sp_runtime::{
3131
testing::Header,
3232
traits::{BlakeTwo256, IdentityLookup},
33+
BuildStorage,
3334
};
3435

3536
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -41,7 +42,7 @@ construct_runtime!(
4142
NodeBlock = Block,
4243
UncheckedExtrinsic = UncheckedExtrinsic,
4344
{
44-
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
45+
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
4546
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
4647
Assets: pallet_assets::{Pallet, Call, Storage, Event<T>},
4748
}
@@ -205,7 +206,7 @@ pub(crate) fn take_hooks() -> Vec<Hook> {
205206
}
206207

207208
pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
208-
let mut storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
209+
let mut storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
209210

210211
let config: pallet_assets::GenesisConfig<Test> = pallet_assets::GenesisConfig {
211212
assets: vec![

‎frame/atomic-swap/src/tests.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ use sp_core::H256;
88
use sp_runtime::{
99
testing::Header,
1010
traits::{BlakeTwo256, IdentityLookup},
11+
BuildStorage,
1112
};
1213

1314
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -19,7 +20,7 @@ frame_support::construct_runtime!(
1920
NodeBlock = Block,
2021
UncheckedExtrinsic = UncheckedExtrinsic,
2122
{
22-
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
23+
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
2324
Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
2425
AtomicSwap: pallet_atomic_swap::{Pallet, Call, Event<T>},
2526
}
@@ -78,7 +79,7 @@ const A: u64 = 1;
7879
const B: u64 = 2;
7980

8081
pub fn new_test_ext() -> sp_io::TestExternalities {
81-
let mut t = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
82+
let mut t = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
8283
let genesis = pallet_balances::GenesisConfig::<Test> { balances: vec![(A, 100), (B, 200)] };
8384
genesis.assimilate_storage(&mut t).unwrap();
8485
t.into()

‎frame/aura/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ pub mod pallet {
159159
}
160160

161161
#[pallet::genesis_build]
162-
impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
162+
impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
163163
fn build(&self) {
164164
Pallet::<T>::initialize_authorities(&self.authorities);
165165
}

‎frame/aura/src/mock.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@
2222
use crate as pallet_aura;
2323
use frame_support::{
2424
parameter_types,
25-
traits::{ConstU32, ConstU64, DisabledValidators, GenesisBuild},
25+
traits::{ConstU32, ConstU64, DisabledValidators},
2626
};
2727
use sp_consensus_aura::{ed25519::AuthorityId, AuthorityIndex};
2828
use sp_core::H256;
2929
use sp_runtime::{
3030
testing::{Header, UintAuthorityId},
3131
traits::IdentityLookup,
32+
BuildStorage,
3233
};
3334

3435
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
@@ -40,7 +41,7 @@ frame_support::construct_runtime!(
4041
NodeBlock = Block,
4142
UncheckedExtrinsic = UncheckedExtrinsic,
4243
{
43-
System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
44+
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
4445
Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
4546
Aura: pallet_aura::{Pallet, Storage, Config<T>},
4647
}
@@ -111,7 +112,7 @@ impl pallet_aura::Config for Test {
111112
}
112113

113114
fn build_ext(authorities: Vec<u64>) -> sp_io::TestExternalities {
114-
let mut storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
115+
let mut storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
115116
pallet_aura::GenesisConfig::<Test> {
116117
authorities: authorities.into_iter().map(|a| UintAuthorityId(a).to_public_key()).collect(),
117118
}

0 commit comments

Comments
 (0)