Migrate some more pallets to construct_runtime (#7975)

* WIP converting balances tests to construct_runtime

* Converting balances tests_local to construct_runtime

* Fix up system and balances Events

* Use static Call instance in tests

* Migrate indices to construct_runtime

* Migrate babe test to construct_runtime

* Update frame/indices/src/mock.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/babe/src/mock.rs

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>

* Update frame/babe/src/mock.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Remove redundant import

Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
This commit is contained in:
Andrew Jones
2021-01-25 15:56:07 +00:00
committed by GitHub
parent 681f8408ce
commit ee85121c57
5 changed files with 109 additions and 139 deletions
+20 -26
View File
@@ -21,25 +21,23 @@
use sp_runtime::testing::Header;
use sp_core::H256;
use frame_support::{impl_outer_origin, impl_outer_event, parameter_types};
use crate::{self as indices, Module, Config};
use frame_system as system;
use pallet_balances as balances;
use frame_support::parameter_types;
use crate::{self as pallet_indices, Config};
impl_outer_origin!{
pub enum Origin for Test where system = frame_system {}
}
impl_outer_event!{
pub enum MetaEvent for Test {
system<T>,
balances<T>,
indices<T>,
type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
type Block = frame_system::mocking::MockBlock<Test>;
frame_support::construct_runtime!(
pub enum Test where
Block = Block,
NodeBlock = Block,
UncheckedExtrinsic = UncheckedExtrinsic,
{
System: frame_system::{Module, Call, Config, Storage, Event<T>},
Balances: pallet_balances::{Module, Call, Storage, Config<T>, Event<T>},
Indices: pallet_indices::{Module, Call, Storage, Config<T>, Event<T>},
}
}
// Workaround for https://github.com/rust-lang/rust/issues/26925 . Remove when sorted.
#[derive(Clone, PartialEq, Eq, Debug)]
pub struct Test;
);
parameter_types! {
pub const BlockHashCount: u64 = 250;
@@ -53,7 +51,7 @@ impl frame_system::Config for Test {
type BlockLength = ();
type DbWeight = ();
type Origin = Origin;
type Call = ();
type Call = Call;
type Index = u64;
type BlockNumber = u64;
type Hash = H256;
@@ -61,10 +59,10 @@ impl frame_system::Config for Test {
type AccountId = u64;
type Lookup = Indices;
type Header = Header;
type Event = MetaEvent;
type Event = Event;
type BlockHashCount = BlockHashCount;
type Version = ();
type PalletInfo = ();
type PalletInfo = PalletInfo;
type AccountData = pallet_balances::AccountData<u64>;
type OnNewAccount = ();
type OnKilledAccount = ();
@@ -80,7 +78,7 @@ impl pallet_balances::Config for Test {
type MaxLocks = ();
type Balance = u64;
type DustRemoval = ();
type Event = MetaEvent;
type Event = Event;
type ExistentialDeposit = ExistentialDeposit;
type AccountStore = System;
type WeightInfo = ();
@@ -94,7 +92,7 @@ impl Config for Test {
type AccountIndex = u64;
type Currency = Balances;
type Deposit = Deposit;
type Event = MetaEvent;
type Event = Event;
type WeightInfo = ();
}
@@ -105,7 +103,3 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
}.assimilate_storage(&mut t).unwrap();
t.into()
}
pub type System = frame_system::Module<Test>;
pub type Balances = pallet_balances::Module<Test>;
pub type Indices = Module<Test>;