git.delta.rocks / unique-network / refs/commits / 9f1da529327c

--- 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,
             }
         }
     }

28            ),*28            ),*
29            $(,)?29            $(,)?
30
31            #[test_pallets]
32            {
33                $(
34                    $test_pallet_name:ident: $test_pallet_mod:ident
35                ),*
36                $(,)?
37            }
38        }30        }
39    ) => {31    ) => {
40        $crate::construct_runtime_helper! {32        $crate::construct_runtime_helper! {
41            select_runtime($select_runtime),33            select_runtime($select_runtime),
42            selected_pallets(),34            selected_pallets(),
43            test_pallets(
44                $(
45                    $test_pallet_name: $test_pallet_mod
46                ),*
47            ),
4835
49            where_clause($($where_ident = $where_ty),*),36            where_clause($($where_ident = $where_ty),*),
50            pallets(37            pallets(
62    (49    (
63        select_runtime($select_runtime:ident),50        select_runtime($select_runtime:ident),
64        selected_pallets($($selected_pallets:tt)*),51        selected_pallets($($selected_pallets:tt)*),
65        test_pallets($($test_pallets:tt)*),
6652
67        where_clause($($where_clause:tt)*),53        where_clause($($where_clause:tt)*),
68        pallets(54        pallets(
76            select_runtime($select_runtime),62            select_runtime($select_runtime),
77            runtimes($($pallet_runtimes),+,),63            runtimes($($pallet_runtimes),+,),
78            selected_pallets($($selected_pallets)*),64            selected_pallets($($selected_pallets)*),
79            test_pallets($($test_pallets)*),
8065
81            where_clause($($where_clause)*),66            where_clause($($where_clause)*),
82            pallets(67            pallets(
89    (74    (
90        select_runtime($select_runtime:ident),75        select_runtime($select_runtime:ident),
91        selected_pallets($($selected_pallets:tt)*),76        selected_pallets($($selected_pallets:tt)*),
92        test_pallets($($test_pallets:tt)*),
9377
94        where_clause($($where_clause:tt)*),78        where_clause($($where_clause:tt)*),
95        pallets(79        pallets(
104                $($selected_pallets)*88                $($selected_pallets)*
105                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,89                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,
106            ),90            ),
107            test_pallets($($test_pallets)*),
10891
109            where_clause($($where_clause)*),92            where_clause($($where_clause)*),
110            pallets($($pallets_tl)*)93            pallets($($pallets_tl)*)
114    (97    (
115        select_runtime($select_runtime:ident),98        select_runtime($select_runtime:ident),
116        selected_pallets($($selected_pallets:tt)*),99        selected_pallets($($selected_pallets:tt)*),
117        test_pallets($($test_pallets:tt)*),
118100
119        where_clause($($where_clause:tt)*),101        where_clause($($where_clause:tt)*),
120        pallets()102        pallets()
121    ) => {103    ) => {
122        #[cfg(not(feature = "test-pallets"))]
123        frame_support::construct_runtime! {104        frame_support::construct_runtime! {
124            pub enum Runtime where105            pub enum Runtime where
125                $($where_clause)*106                $($where_clause)*
128            }109            }
129        }110        }
130
131        #[cfg(feature = "test-pallets")]
132        frame_support::construct_runtime! {
133            pub enum Runtime where
134                $($where_clause)*
135            {
136                $($selected_pallets)*
137                $($test_pallets)*
138            }
139        }
140    };111    };
141}112}
142113
146        select_runtime(opal),117        select_runtime(opal),
147        runtimes(opal, $($_runtime_tl:tt)*),118        runtimes(opal, $($_runtime_tl:tt)*),
148        selected_pallets($($selected_pallets:tt)*),119        selected_pallets($($selected_pallets:tt)*),
149        test_pallets($($test_pallets:tt)*),
150120
151        where_clause($($where_clause:tt)*),121        where_clause($($where_clause:tt)*),
152        pallets(122        pallets(
160                $($selected_pallets)*130                $($selected_pallets)*
161                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,131                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,
162            ),132            ),
163            test_pallets($($test_pallets)*),
164133
165            where_clause($($where_clause)*),134            where_clause($($where_clause)*),
166            pallets($($pallets_tl)*)135            pallets($($pallets_tl)*)
171        select_runtime(quartz),140        select_runtime(quartz),
172        runtimes(quartz, $($_runtime_tl:tt)*),141        runtimes(quartz, $($_runtime_tl:tt)*),
173        selected_pallets($($selected_pallets:tt)*),142        selected_pallets($($selected_pallets:tt)*),
174        test_pallets($($test_pallets:tt)*),
175143
176        where_clause($($where_clause:tt)*),144        where_clause($($where_clause:tt)*),
177        pallets(145        pallets(
185                $($selected_pallets)*153                $($selected_pallets)*
186                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,154                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,
187            ),155            ),
188            test_pallets($($test_pallets)*),
189156
190            where_clause($($where_clause)*),157            where_clause($($where_clause)*),
191            pallets($($pallets_tl)*)158            pallets($($pallets_tl)*)
196        select_runtime(unique),163        select_runtime(unique),
197        runtimes(unique, $($_runtime_tl:tt)*),164        runtimes(unique, $($_runtime_tl:tt)*),
198        selected_pallets($($selected_pallets:tt)*),165        selected_pallets($($selected_pallets:tt)*),
199        test_pallets($($test_pallets:tt)*),
200166
201        where_clause($($where_clause:tt)*),167        where_clause($($where_clause:tt)*),
202        pallets(168        pallets(
210                $($selected_pallets)*176                $($selected_pallets)*
211                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,177                $pallet_name: $pallet_mod$(::{$($pallet_parts),*})? = $index,
212            ),178            ),
213            test_pallets($($test_pallets)*),
214179
215            where_clause($($where_clause)*),180            where_clause($($where_clause)*),
216            pallets($($pallets_tl)*)181            pallets($($pallets_tl)*)
221        select_runtime($select_runtime:ident),186        select_runtime($select_runtime:ident),
222        runtimes($_current_runtime:ident, $($runtime_tl:tt)*),187        runtimes($_current_runtime:ident, $($runtime_tl:tt)*),
223        selected_pallets($($selected_pallets:tt)*),188        selected_pallets($($selected_pallets:tt)*),
224        test_pallets($($test_pallets:tt)*),
225189
226        where_clause($($where_clause:tt)*),190        where_clause($($where_clause:tt)*),
227        pallets($($pallets:tt)*)191        pallets($($pallets:tt)*)
230            select_runtime($select_runtime),194            select_runtime($select_runtime),
231            runtimes($($runtime_tl)*),195            runtimes($($runtime_tl)*),
232            selected_pallets($($selected_pallets)*),196            selected_pallets($($selected_pallets)*),
233            test_pallets($($test_pallets)*),
234197
235            where_clause($($where_clause)*),198            where_clause($($where_clause)*),
236            pallets($($pallets)*)199            pallets($($pallets)*)
241        select_runtime($select_runtime:ident),204        select_runtime($select_runtime:ident),
242        runtimes(),205        runtimes(),
243        selected_pallets($($selected_pallets:tt)*),206        selected_pallets($($selected_pallets:tt)*),
244        test_pallets($($test_pallets:tt)*),
245207
246        where_clause($($where_clause:tt)*),208        where_clause($($where_clause:tt)*),
247        pallets(209        pallets(
252        $crate::construct_runtime_helper! {214        $crate::construct_runtime_helper! {
253            select_runtime($select_runtime),215            select_runtime($select_runtime),
254            selected_pallets($($selected_pallets)*),216            selected_pallets($($selected_pallets)*),
255            test_pallets($($test_pallets)*),
256217
257            where_clause($($where_clause)*),218            where_clause($($where_clause)*),
258            pallets($($pallets_tl)*)219            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