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

difftreelog

fix test-pallet included only in opal

Daniel Shiposha2022-10-11parent: #18c626a.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
8805 "pallet-structure",8805 "pallet-structure",
8806 "pallet-sudo",8806 "pallet-sudo",
8807 "pallet-template-transaction-payment",8807 "pallet-template-transaction-payment",
8808 "pallet-test-utils",
8809 "pallet-timestamp",8808 "pallet-timestamp",
8810 "pallet-transaction-payment",8809 "pallet-transaction-payment",
8811 "pallet-transaction-payment-rpc-runtime-api",8810 "pallet-transaction-payment-rpc-runtime-api",
12879 "pallet-structure",12878 "pallet-structure",
12880 "pallet-sudo",12879 "pallet-sudo",
12881 "pallet-template-transaction-payment",12880 "pallet-template-transaction-payment",
12882 "pallet-test-utils",
12883 "pallet-timestamp",12881 "pallet-timestamp",
12884 "pallet-transaction-payment",12882 "pallet-transaction-payment",
12885 "pallet-transaction-payment-rpc-runtime-api",12883 "pallet-transaction-payment-rpc-runtime-api",
modifiednode/cli/Cargo.tomldiffbeforeafterboth
336 'opal-runtime?/try-runtime',336 'opal-runtime?/try-runtime',
337]337]
338
339test-pallets = [
340 'unique-runtime?/test-pallets',
341 'quartz-runtime?/test-pallets',
342]
343338
modifiedruntime/common/config/mod.rsdiffbeforeafterboth
22pub mod substrate;22pub mod substrate;
23pub mod xcm;23pub mod xcm;
2424
25#[cfg(feature = "test-pallets")]25#[cfg(feature = "pallet-test-utils")]
26pub mod test_pallets;26pub mod test_pallets;
2727
modifiedruntime/common/construct_runtime/mod.rsdiffbeforeafterboth
94 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,94 EvmTransactionPayment: pallet_evm_transaction_payment::{Pallet} = 152,
95 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,95 EvmMigration: pallet_evm_migration::{Pallet, Call, Storage} = 153,
9696
97 #[test_pallets]97 #[runtimes(opal)]
98 {
99 TestUtils: pallet_test_utils,98 TestUtils: pallet_test_utils = 255,
100 }
101 }99 }
102 }100 }
103 }101 }
modifiedruntime/common/construct_runtime/util.rsdiffbeforeafterboth
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)*)
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
170170
171 'pallet-test-utils?/std',171 'pallet-test-utils?/std',
172]172]
173test-pallets = ['pallet-test-utils']
174limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']173limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
175opal-runtime = ['refungible', 'rmrk', 'app-promotion', 'foreign-assets']174opal-runtime = ['refungible', 'scheduler', 'rmrk', 'app-promotion', 'foreign-assets', 'pallet-test-utils']
176175
177refungible = []176refungible = []
178scheduler = []177scheduler = []
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
166 "orml-traits/std",166 "orml-traits/std",
167 "pallet-foreign-assets/std",167 "pallet-foreign-assets/std",
168
169 'pallet-test-utils?/std',
170]168]
171test-pallets = ['pallet-test-utils']
172limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']169limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
173quartz-runtime = ['refungible']170quartz-runtime = ['refungible']
174171
491up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.30' }488up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.30' }
492pallet-foreign-assets = { default-features = false, path = "../../pallets/foreign-assets" }489pallet-foreign-assets = { default-features = false, path = "../../pallets/foreign-assets" }
493
494################################################################################
495# Test dependencies
496
497pallet-test-utils = { optional = true, default-features = false, path = "../../test-pallets/utils" }
498490
499################################################################################491################################################################################
500# Other Dependencies492# Other Dependencies
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
167 "orml-traits/std",167 "orml-traits/std",
168 "pallet-foreign-assets/std",168 "pallet-foreign-assets/std",
169
170 'pallet-test-utils?/std',
171]169]
172test-pallets = ['pallet-test-utils']
173limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']170limit-testing = ['pallet-unique/limit-testing', 'up-data-structs/limit-testing']
174unique-runtime = []171unique-runtime = []
175172
485up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.30' }482up-sponsorship = { default-features = false, git = "https://github.com/uniquenetwork/pallet-sponsoring", branch = 'polkadot-v0.9.30' }
486pallet-foreign-assets = { default-features = false, path = "../../pallets/foreign-assets" }483pallet-foreign-assets = { default-features = false, path = "../../pallets/foreign-assets" }
487
488################################################################################
489# Test dependencies
490
491pallet-test-utils = { optional = true, default-features = false, path = "../../test-pallets/utils" }
492484
493################################################################################485################################################################################
494# Other Dependencies486# Other Dependencies