Switch All construct_runtimes to New Syntax (#2979)

Clean up all the old syntax.

---------

Co-authored-by: command-bot <>
Co-authored-by: gupnik <nikhilgupta.iitk@gmail.com>
Co-authored-by: Nikhil Gupta <17176722+gupnik@users.noreply.github.com>
Co-authored-by: Maksym H <1177472+mordamax@users.noreply.github.com>
This commit is contained in:
joe petrowski
2024-01-22 08:15:53 +01:00
committed by GitHub
parent d37a45650e
commit 757ae372f7
133 changed files with 792 additions and 847 deletions
@@ -1,4 +1,4 @@
error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},`
error: `System` pallet declaration is missing. Please add this line: `System: frame_system,`
--> tests/construct_runtime_ui/missing_system_module.rs:22:2
|
22 | / {
@@ -64,7 +64,7 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u64, Runti
pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
frame_support::construct_runtime!(
pub struct Runtime
pub enum Runtime
{
// Exclude part `Storage` in order not to check its metadata in tests.
System: frame_system,
@@ -201,7 +201,6 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
frame_support::construct_runtime!(
pub enum Runtime
{
System: frame_system,
FinalKeysNone: no_instance,
+9 -18
View File
@@ -278,24 +278,14 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
frame_support::construct_runtime!(
pub enum Runtime
{
System: frame_system::{Pallet, Call, Event<T>},
Module1_1: module1::<Instance1>::{
Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
},
Module1_2: module1::<Instance2>::{
Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
},
Module2: module2::{Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent},
Module2_1: module2::<Instance1>::{
Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
},
Module2_2: module2::<Instance2>::{
Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
},
Module2_3: module2::<Instance3>::{
Pallet, Call, Storage, Event<T>, Config<T>, Origin<T>, Inherent
},
Module3: module3::{Pallet, Call},
System: frame_system,
Module1_1: module1::<Instance1>,
Module1_2: module1::<Instance2>,
Module2: module2,
Module2_1: module2::<Instance1>,
Module2_2: module2::<Instance2>,
Module2_3: module2::<Instance3>,
Module3: module3,
}
);
@@ -350,6 +340,7 @@ impl module3::Config for Runtime {
fn new_test_ext() -> sp_io::TestExternalities {
RuntimeGenesisConfig {
system: Default::default(),
module_1_1: module1::GenesisConfig { value: 3, test: 2 },
module_1_2: module1::GenesisConfig { value: 4, test: 5 },
module_2: module2::GenesisConfig {
@@ -176,7 +176,7 @@ impl frame_system::Config for Runtime {
impl module::Config for Runtime {}
frame_support::construct_runtime!(
pub struct Runtime {
pub enum Runtime {
System: frame_system,
Module: module,
}
@@ -57,8 +57,8 @@ impl frame_system::Config for Runtime {
construct_runtime! {
pub struct Runtime
{
System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
Pallet: test_pallet::{Pallet, Config<T>},
System: frame_system,
Pallet: test_pallet,
}
}
@@ -94,7 +94,7 @@ impl frame_system::Config for Runtime {
impl Config for Runtime {}
frame_support::construct_runtime!(
pub struct Runtime {
pub enum Runtime {
System: frame_system,
MyPallet: pallet,
}
@@ -66,8 +66,8 @@ impl dummy_pallet::Config for Test {}
construct_runtime!(
pub enum Test
{
System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
DummyPallet: dummy_pallet::{Pallet, Config<T>, Storage} = 1,
System: frame_system = 0,
DummyPallet: dummy_pallet = 1,
}
);