From 9f1da529327c27b741564596149ed5e9a7fa0fc4 Mon Sep 17 00:00:00 2001 From: Daniel Shiposha Date: Tue, 11 Oct 2022 19:05:58 +0000 Subject: [PATCH] fix: test-pallet included only in opal --- --- a/Cargo.lock +++ b/Cargo.lock @@ -8805,7 +8805,6 @@ "pallet-structure", "pallet-sudo", "pallet-template-transaction-payment", - "pallet-test-utils", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", @@ -12879,7 +12878,6 @@ "pallet-structure", "pallet-sudo", "pallet-template-transaction-payment", - "pallet-test-utils", "pallet-timestamp", "pallet-transaction-payment", "pallet-transaction-payment-rpc-runtime-api", --- a/node/cli/Cargo.toml +++ b/node/cli/Cargo.toml @@ -335,8 +335,3 @@ 'quartz-runtime?/try-runtime', 'opal-runtime?/try-runtime', ] - -test-pallets = [ - 'unique-runtime?/test-pallets', - 'quartz-runtime?/test-pallets', -] --- a/runtime/common/config/mod.rs +++ b/runtime/common/config/mod.rs @@ -22,5 +22,5 @@ pub mod substrate; pub mod xcm; -#[cfg(feature = "test-pallets")] +#[cfg(feature = "pallet-test-utils")] pub mod test_pallets; --- a/runtime/common/construct_runtime/mod.rs +++ b/runtime/common/construct_runtime/mod.rs @@ -94,10 +94,8 @@ EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152, EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153, - #[test_pallets] - { - TestUtils: pallet_test_utils, - } + #[runtimes(opal)] + TestUtils: pallet_test_utils = 255, } } } --- a/runtime/common/construct_runtime/util.rs +++ b/runtime/common/construct_runtime/util.rs @@ -27,24 +27,11 @@ $pallet_name:ident: $pallet_mod:ident$(::{$($pallet_parts:ty),*})? = $index:literal ),* $(,)? - - #[test_pallets] - { - $( - $test_pallet_name:ident: $test_pallet_mod:ident - ),* - $(,)? - } } ) => { $crate::construct_runtime_helper! { select_runtime($select_runtime), selected_pallets(), - test_pallets( - $( - $test_pallet_name: $test_pallet_mod - ),* - ), where_clause($($where_ident = $where_ty),*), pallets( @@ -62,7 +49,6 @@ ( select_runtime($select_runtime:ident), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets( @@ -76,7 +62,6 @@ select_runtime($select_runtime), runtimes($($pallet_runtimes),+,), selected_pallets($($selected_pallets)*), - test_pallets($($test_pallets)*), where_clause($($where_clause)*), pallets( @@ -89,7 +74,6 @@ ( select_runtime($select_runtime:ident), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets( @@ -104,7 +88,6 @@ $($selected_pallets)* $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index, ), - test_pallets($($test_pallets)*), where_clause($($where_clause)*), pallets($($pallets_tl)*) @@ -114,12 +97,10 @@ ( select_runtime($select_runtime:ident), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets() ) => { - #[cfg(not(feature = "test-pallets"))] frame_support::construct_runtime! { pub enum Runtime where $($where_clause)* @@ -127,16 +108,6 @@ $($selected_pallets)* } } - - #[cfg(feature = "test-pallets")] - frame_support::construct_runtime! { - pub enum Runtime where - $($where_clause)* - { - $($selected_pallets)* - $($test_pallets)* - } - } }; } @@ -146,7 +117,6 @@ select_runtime(opal), runtimes(opal, $($_runtime_tl:tt)*), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets( @@ -160,7 +130,6 @@ $($selected_pallets)* $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index, ), - test_pallets($($test_pallets)*), where_clause($($where_clause)*), pallets($($pallets_tl)*) @@ -171,7 +140,6 @@ select_runtime(quartz), runtimes(quartz, $($_runtime_tl:tt)*), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets( @@ -185,7 +153,6 @@ $($selected_pallets)* $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index, ), - test_pallets($($test_pallets)*), where_clause($($where_clause)*), pallets($($pallets_tl)*) @@ -196,7 +163,6 @@ select_runtime(unique), runtimes(unique, $($_runtime_tl:tt)*), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets( @@ -210,7 +176,6 @@ $($selected_pallets)* $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index, ), - test_pallets($($test_pallets)*), where_clause($($where_clause)*), pallets($($pallets_tl)*) @@ -221,7 +186,6 @@ select_runtime($select_runtime:ident), runtimes($_current_runtime:ident, $($runtime_tl:tt)*), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets($($pallets:tt)*) @@ -230,7 +194,6 @@ select_runtime($select_runtime), runtimes($($runtime_tl)*), selected_pallets($($selected_pallets)*), - test_pallets($($test_pallets)*), where_clause($($where_clause)*), pallets($($pallets)*) @@ -241,7 +204,6 @@ select_runtime($select_runtime:ident), runtimes(), selected_pallets($($selected_pallets:tt)*), - test_pallets($($test_pallets:tt)*), where_clause($($where_clause:tt)*), pallets( @@ -252,7 +214,6 @@ $crate::construct_runtime_helper! { select_runtime($select_runtime), selected_pallets($($selected_pallets)*), - test_pallets($($test_pallets)*), where_clause($($where_clause)*), pallets($($pallets_tl)*) --- a/runtime/opal/Cargo.toml +++ b/runtime/opal/Cargo.toml @@ -170,9 +170,8 @@ 'pallet-test-utils?/std', ] -test-pallets = ['pallet-test-utils'] limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing'] -opal-runtime = ['refungible', 'rmrk', 'app-promotion', 'foreign-assets'] +opal-runtime = ['refungible', 'scheduler', 'rmrk', 'app-promotion', 'foreign-assets', 'pallet-test-utils'] refungible = [] scheduler = [] --- a/runtime/quartz/Cargo.toml +++ b/runtime/quartz/Cargo.toml @@ -165,10 +165,7 @@ "orml-xtokens/std", "orml-traits/std", "pallet-foreign-assets/std", - - 'pallet-test-utils?/std', ] -test-pallets = ['pallet-test-utils'] limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing'] quartz-runtime = ['refungible'] @@ -490,11 +487,6 @@ evm-coder = { default-features = false, path = '../../crates/evm-coder' } up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.30' } pallet-foreign-assets = { default-features = false, path = "../../pallets/foreign-assets" } - -################################################################################ -# Test dependencies - -pallet-test-utils = { optional = true, default-features = false, path = "../../test-pallets/utils" } ################################################################################ # Other Dependencies --- a/runtime/unique/Cargo.toml +++ b/runtime/unique/Cargo.toml @@ -166,10 +166,7 @@ "orml-xtokens/std", "orml-traits/std", "pallet-foreign-assets/std", - - 'pallet-test-utils?/std', ] -test-pallets = ['pallet-test-utils'] limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing'] unique-runtime = [] @@ -484,11 +481,6 @@ evm-coder = { default-features = false, path = '../../crates/evm-coder' } up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.30' } pallet-foreign-assets = { default-features = false, path = "../../pallets/foreign-assets" } - -################################################################################ -# Test dependencies - -pallet-test-utils = { optional = true, default-features = false, path = "../../test-pallets/utils" } ################################################################################ # Other Dependencies -- gitstuff