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

* GenesisBuild<T,I> deprecated. BuildGenesisConfig added

* fmt

* fixes

* more fixes

* more fixes

* fixes

* update lockfile for {"substrate"}

* fix

---------

Co-authored-by: parity-processbot <>
This commit is contained in:
Michal Kucharczyk
2023-07-12 13:04:15 +02:00
committed by GitHub
parent bcb9bd0432
commit 95ba849ee6
32 changed files with 397 additions and 347 deletions
+6 -7
View File
@@ -27,8 +27,7 @@ use crate::{
use frame_support::{
assert_ok, parameter_types,
traits::{
Currency, GenesisBuild, ProcessMessage, ProcessMessageError, ValidatorSet,
ValidatorSetWithIdentification,
Currency, ProcessMessage, ProcessMessageError, ValidatorSet, ValidatorSetWithIdentification,
},
weights::{Weight, WeightMeter},
};
@@ -43,7 +42,7 @@ use sp_io::TestExternalities;
use sp_runtime::{
traits::{AccountIdConversion, BlakeTwo256, IdentityLookup},
transaction_validity::TransactionPriority,
Permill,
BuildStorage, Permill,
};
use std::{cell::RefCell, collections::HashMap};
@@ -485,9 +484,9 @@ pub fn new_test_ext(state: MockGenesisConfig) -> TestExternalities {
BACKING_REWARDS.with(|r| r.borrow_mut().clear());
AVAILABILITY_REWARDS.with(|r| r.borrow_mut().clear());
let mut t = state.system.build_storage::<Test>().unwrap();
let mut t = state.system.build_storage().unwrap();
state.configuration.assimilate_storage(&mut t).unwrap();
GenesisBuild::<Test>::assimilate_storage(&state.paras, &mut t).unwrap();
state.paras.assimilate_storage(&mut t).unwrap();
let mut ext: TestExternalities = t.into();
ext.register_extension(KeystoreExt(Arc::new(MemoryKeystore::new()) as KeystorePtr));
@@ -497,9 +496,9 @@ pub fn new_test_ext(state: MockGenesisConfig) -> TestExternalities {
#[derive(Default)]
pub struct MockGenesisConfig {
pub system: frame_system::GenesisConfig,
pub system: frame_system::GenesisConfig<Test>,
pub configuration: crate::configuration::GenesisConfig<Test>,
pub paras: crate::paras::GenesisConfig,
pub paras: crate::paras::GenesisConfig<Test>,
}
pub fn assert_last_event(generic_event: RuntimeEvent) {