difftreelog
fix test-pallet included only in opal
in: master
8 files changed
Cargo.lockdiffbeforeafterboth--- 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",
node/cli/Cargo.tomldiffbeforeafterboth--- 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',
-]
runtime/common/config/mod.rsdiffbeforeafterboth--- 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;
runtime/common/construct_runtime/mod.rsdiffbeforeafterboth1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617mod util;1819#[macro_export]20macro_rules! construct_runtime {21 ($select_runtime:ident) => {22 $crate::construct_runtime_impl! {23 select_runtime($select_runtime);2425 pub enum Runtime where26 Block = Block,27 NodeBlock = opaque::Block,28 UncheckedExtrinsic = UncheckedExtrinsic29 {30 System: frame_system = 0,3132 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,33 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,3435 Aura: pallet_aura::{Pallet, Config<T>} = 22,36 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,3738 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,39 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,40 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,41 TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,42 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,43 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,44 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,4546 XTokens: orml_xtokens = 38,47 Tokens: orml_tokens = 39,48 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,4950 // XCM helpers.51 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,52 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,53 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,54 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,5556 // Unique Pallets57 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,58 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,5960 // #[runtimes(opal)]61 // Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,6263 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,6465 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,66 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,67 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,68 Fungible: pallet_fungible::{Pallet, Storage} = 67,6970 #[runtimes(opal, quartz)]71 Refungible: pallet_refungible::{Pallet, Storage} = 68,7273 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,74 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,7576 #[runtimes(opal)]77 RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,7879 #[runtimes(opal)]80 RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,8182 #[runtimes(opal)]83 AppPromotion: pallet_app_promotion::{Pallet, Call, Storage, Event<T>} = 73,8485 #[runtimes(opal)]86 ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event<T>} = 80,8788 // Frontier89 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,90 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,9192 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,93 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,94 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,95 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,9697 #[test_pallets]98 {99 TestUtils: pallet_test_utils,100 }101 }102 }103 }104}1// Copyright 2019-2022 Unique Network (Gibraltar) Ltd.2// This file is part of Unique Network.34// Unique Network is free software: you can redistribute it and/or modify5// it under the terms of the GNU General Public License as published by6// the Free Software Foundation, either version 3 of the License, or7// (at your option) any later version.89// Unique Network is distributed in the hope that it will be useful,10// but WITHOUT ANY WARRANTY; without even the implied warranty of11// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the12// GNU General Public License for more details.1314// You should have received a copy of the GNU General Public License15// along with Unique Network. If not, see <http://www.gnu.org/licenses/>.1617mod util;1819#[macro_export]20macro_rules! construct_runtime {21 ($select_runtime:ident) => {22 $crate::construct_runtime_impl! {23 select_runtime($select_runtime);2425 pub enum Runtime where26 Block = Block,27 NodeBlock = opaque::Block,28 UncheckedExtrinsic = UncheckedExtrinsic29 {30 System: frame_system = 0,3132 ParachainSystem: cumulus_pallet_parachain_system::{Pallet, Call, Config, Storage, Inherent, Event<T>, ValidateUnsigned} = 20,33 ParachainInfo: parachain_info::{Pallet, Storage, Config} = 21,3435 Aura: pallet_aura::{Pallet, Config<T>} = 22,36 AuraExt: cumulus_pallet_aura_ext::{Pallet, Config} = 23,3738 Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>} = 30,39 RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage} = 31,40 Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent} = 32,41 TransactionPayment: pallet_transaction_payment::{Pallet, Storage, Event<T>} = 33,42 Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>} = 34,43 Sudo: pallet_sudo::{Pallet, Call, Storage, Config<T>, Event<T>} = 35,44 Vesting: orml_vesting::{Pallet, Storage, Call, Event<T>, Config<T>} = 37,4546 XTokens: orml_xtokens = 38,47 Tokens: orml_tokens = 39,48 // Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>} = 38,4950 // XCM helpers.51 XcmpQueue: cumulus_pallet_xcmp_queue::{Pallet, Call, Storage, Event<T>} = 50,52 PolkadotXcm: pallet_xcm::{Pallet, Call, Event<T>, Origin} = 51,53 CumulusXcm: cumulus_pallet_xcm::{Pallet, Call, Event<T>, Origin} = 52,54 DmpQueue: cumulus_pallet_dmp_queue::{Pallet, Call, Storage, Event<T>} = 53,5556 // Unique Pallets57 Inflation: pallet_inflation::{Pallet, Call, Storage} = 60,58 Unique: pallet_unique::{Pallet, Call, Storage, Event<T>} = 61,5960 // #[runtimes(opal)]61 // Scheduler: pallet_unique_scheduler::{Pallet, Call, Storage, Event<T>} = 62,6263 Configuration: pallet_configuration::{Pallet, Call, Storage} = 63,6465 Charging: pallet_charge_transaction::{Pallet, Call, Storage } = 64,66 // ContractHelpers: pallet_contract_helpers::{Pallet, Call, Storage} = 65,67 Common: pallet_common::{Pallet, Storage, Event<T>} = 66,68 Fungible: pallet_fungible::{Pallet, Storage} = 67,6970 #[runtimes(opal, quartz)]71 Refungible: pallet_refungible::{Pallet, Storage} = 68,7273 Nonfungible: pallet_nonfungible::{Pallet, Storage} = 69,74 Structure: pallet_structure::{Pallet, Call, Storage, Event<T>} = 70,7576 #[runtimes(opal)]77 RmrkCore: pallet_proxy_rmrk_core::{Pallet, Call, Storage, Event<T>} = 71,7879 #[runtimes(opal)]80 RmrkEquip: pallet_proxy_rmrk_equip::{Pallet, Call, Storage, Event<T>} = 72,8182 #[runtimes(opal)]83 AppPromotion: pallet_app_promotion::{Pallet, Call, Storage, Event<T>} = 73,8485 #[runtimes(opal)]86 ForeignAssets: pallet_foreign_assets::{Pallet, Call, Storage, Event<T>} = 80,8788 // Frontier89 EVM: pallet_evm::{Pallet, Config, Call, Storage, Event<T>} = 100,90 Ethereum: pallet_ethereum::{Pallet, Config, Call, Storage, Event, Origin} = 101,9192 EvmCoderSubstrate: pallet_evm_coder_substrate::{Pallet, Storage} = 150,93 EvmContractHelpers: pallet_evm_contract_helpers::{Pallet, Storage, Event<T>} = 151,94 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,95 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,9697 #[runtimes(opal)]98 TestUtils: pallet_test_utils = 255,99 }100 }101 }102}runtime/common/construct_runtime/util.rsdiffbeforeafterboth--- 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)*)
runtime/opal/Cargo.tomldiffbeforeafterboth--- 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 = []
runtime/quartz/Cargo.tomldiffbeforeafterboth--- 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
runtime/unique/Cargo.tomldiffbeforeafterboth--- 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