pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-26 09:57:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use pallet names to name enum variants (#8990)

Browse Source 
* Remove unused event_metadata variable

* Eliminate mod_name and use pallet names to name enum variants

* Rename field name `pallet` to `path`

* Use only the pallet name to generate variant names

* Use new naming scheme for Event enum in sudo pallet tests

* Use new naming scheme for Event enum in offences pallet tests

* Use new naming scheme for Event enum in contracts pallet tests

* Use new naming scheme for Event enum in collective pallet tests

* Use new naming scheme for Event enum in bounties pallet tests

* Use new naming scheme for Event enum in balances pallet tests

* Use new naming scheme for Event enum in assets pallet tests

* Use new naming scheme for Event enum in frame support tests

* Use new naming scheme for Event enum in tips pallet tests

* Use new naming scheme for Event enum in transaction payment pallet tests

* Use new naming scheme for GenesisConfig fields in example pallet tests

* Use new naming scheme for GenesisConfig fields in elections pallet tests

* Use new naming scheme for Event enum in election provider multi-phase pallet tests

* Use new naming scheme for Event enum in elections phragmen pallet tests

* Use new naming scheme for GenesisConfig fields in chain spec

* Use new naming scheme for Event enum in staking pallet mock

* Use new naming scheme for GenesisConfig fields in node-template chain spec

* Use new naming scheme for GenesisConfig fields in node-testing chain spec

* Use new naming scheme for Event enum in node executor tests

* Use new naming scheme for GenesisConfig fields in transaction storage pallet mock

* Refactor match conditions
This commit is contained in:
Keith Yeung
2021-06-09 02:31:29 -07:00
committed by GitHub
parent ea6831e398
commit 828d1d74aa
32 changed files with 274 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/frame/support/test/tests/construct_runtime.rs
+9 -9
View File
@@ -383,31 +383,31 @@ fn origin_codec() {
let origin = OriginCaller::system(system::RawOrigin::None);
assert_eq!(origin.encode()[0], 30);
let origin = OriginCaller::module1_Instance1(module1::Origin(Default::default()));
let origin = OriginCaller::Module1_1(module1::Origin(Default::default()));
assert_eq!(origin.encode()[0], 31);
let origin = OriginCaller::module2(module2::Origin);
let origin = OriginCaller::Module2(module2::Origin);
assert_eq!(origin.encode()[0], 32);
let origin = OriginCaller::module1_Instance2(module1::Origin(Default::default()));
let origin = OriginCaller::Module1_2(module1::Origin(Default::default()));
assert_eq!(origin.encode()[0], 33);
let origin = OriginCaller::nested_module3(nested::module3::Origin);
let origin = OriginCaller::NestedModule3(nested::module3::Origin);
assert_eq!(origin.encode()[0], 34);
let origin = OriginCaller::module3(module3::Origin(Default::default()));
let origin = OriginCaller::Module3(module3::Origin(Default::default()));
assert_eq!(origin.encode()[0], 35);
let origin = OriginCaller::module1_Instance6(module1::Origin(Default::default()));
let origin = OriginCaller::Module1_6(module1::Origin(Default::default()));
assert_eq!(origin.encode()[0], 1);
let origin = OriginCaller::module1_Instance7(module1::Origin(Default::default()));
let origin = OriginCaller::Module1_7(module1::Origin(Default::default()));
assert_eq!(origin.encode()[0], 2);
let origin = OriginCaller::module1_Instance8(module1::Origin(Default::default()));
let origin = OriginCaller::Module1_8(module1::Origin(Default::default()));
assert_eq!(origin.encode()[0], 12);
let origin = OriginCaller::module1_Instance9(module1::Origin(Default::default()));
let origin = OriginCaller::Module1_9(module1::Origin(Default::default()));
assert_eq!(origin.encode()[0], 13);
}
substrate/frame/support/test/tests/instance.rs
+6 -6
View File
@@ -299,26 +299,26 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, Call, Signature,
fn new_test_ext() -> sp_io::TestExternalities {
GenesisConfig{
module1_Instance1: module1::GenesisConfig {
module_1_1: module1::GenesisConfig {
value: 3,
test: 2,
},
module1_Instance2: module1::GenesisConfig {
module_1_2: module1::GenesisConfig {
value: 4,
test: 5,
},
module2: module2::GenesisConfig {
module_2: module2::GenesisConfig {
value: 4,
map: vec![(0, 0)],
double_map: vec![(0, 0, 0)],
},
module2_Instance1: module2::GenesisConfig {
module_2_1: module2::GenesisConfig {
value: 4,
map: vec![(0, 0)],
double_map: vec![(0, 0, 0)],
},
module2_Instance2: Default::default(),
module2_Instance3: Default::default(),
module_2_2: Default::default(),
module_2_3: Default::default(),
}.build_storage().unwrap().into()
}
substrate/frame/support/test/tests/pallet.rs
+5 -5
View File
@@ -485,7 +485,7 @@ fn transactional_works() {
pallet::Call::<Runtime>::foo_transactional(1).dispatch_bypass_filter(None.into()).unwrap();
assert_eq!(
frame_system::Pallet::<Runtime>::events().iter().map(|e| &e.event).collect::<Vec<_>>(),
vec![&Event::pallet(pallet::Event::Something(0))],
vec![&Event::Example(pallet::Event::Something(0))],
);
})
}
@@ -550,7 +550,7 @@ fn pallet_expand_deposit_event() {
pallet::Call::<Runtime>::foo(3, 0).dispatch_bypass_filter(None.into()).unwrap();
assert_eq!(
frame_system::Pallet::<Runtime>::events()[0].event,
Event::pallet(pallet::Event::Something(3)),
Event::Example(pallet::Event::Something(3)),
);
})
}
@@ -643,15 +643,15 @@ fn pallet_hooks_expand() {
assert_eq!(
frame_system::Pallet::<Runtime>::events()[0].event,
Event::pallet(pallet::Event::Something(10)),
Event::Example(pallet::Event::Something(10)),
);
assert_eq!(
frame_system::Pallet::<Runtime>::events()[1].event,
Event::pallet(pallet::Event::Something(20)),
Event::Example(pallet::Event::Something(20)),
);
assert_eq!(
frame_system::Pallet::<Runtime>::events()[2].event,
Event::pallet(pallet::Event::Something(30)),
Event::Example(pallet::Event::Something(30)),
);
})
}
substrate/frame/support/test/tests/pallet_instance.rs
+8 -8
View File
@@ -394,7 +394,7 @@ fn pallet_expand_deposit_event() {
pallet::Call::<Runtime>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
assert_eq!(
frame_system::Pallet::<Runtime>::events()[0].event,
Event::pallet(pallet::Event::Something(3)),
Event::Example(pallet::Event::Something(3)),
);
});
@@ -403,7 +403,7 @@ fn pallet_expand_deposit_event() {
pallet::Call::<Runtime, pallet::Instance1>::foo(3).dispatch_bypass_filter(None.into()).unwrap();
assert_eq!(
frame_system::Pallet::<Runtime>::events()[0].event,
Event::pallet_Instance1(pallet::Event::Something(3)),
Event::Instance1Example(pallet::Event::Something(3)),
);
});
}
@@ -539,27 +539,27 @@ fn pallet_hooks_expand() {
// The order is indeed reversed due to https://github.com/paritytech/substrate/issues/6280
assert_eq!(
frame_system::Pallet::<Runtime>::events()[0].event,
Event::pallet_Instance1(pallet::Event::Something(11)),
Event::Instance1Example(pallet::Event::Something(11)),
);
assert_eq!(
frame_system::Pallet::<Runtime>::events()[1].event,
Event::pallet(pallet::Event::Something(10)),
Event::Example(pallet::Event::Something(10)),
);
assert_eq!(
frame_system::Pallet::<Runtime>::events()[2].event,
Event::pallet_Instance1(pallet::Event::Something(21)),
Event::Instance1Example(pallet::Event::Something(21)),
);
assert_eq!(
frame_system::Pallet::<Runtime>::events()[3].event,
Event::pallet(pallet::Event::Something(20)),
Event::Example(pallet::Event::Something(20)),
);
assert_eq!(
frame_system::Pallet::<Runtime>::events()[4].event,
Event::pallet_Instance1(pallet::Event::Something(31)),
Event::Instance1Example(pallet::Event::Something(31)),
);
assert_eq!(
frame_system::Pallet::<Runtime>::events()[5].event,
Event::pallet(pallet::Event::Something(30)),
Event::Example(pallet::Event::Something(30)),
);
})
}