git.delta.rocks / unique-network / refs/commits / f5faed258f1b

difftreelog

fix make check

Yaroslav Bolyukin2023-11-17parent: #7f81f6c.patch.diff
in: master

8 files changed

modifiedCargo.lockdiffbeforeafterboth
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -10160,6 +10160,7 @@
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "precompile-utils-macro",
  "scale-info",
  "serde",
@@ -15037,6 +15038,7 @@
  "pallet-xcm",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "precompile-utils-macro",
  "scale-info",
  "serde",
modifiedCargo.tomldiffbeforeafterboth
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -131,13 +131,12 @@
 pallet-transaction-payment-rpc-runtime-api = { default-features = false, version = "25.0.0" }
 pallet-treasury = { default-features = false, version = "24.0.0" }
 pallet-utility = { default-features = false, version = "25.0.0" }
-pallet-xcm = { default-features = false , version = "4.0.0" }
-staging-parachain-info = { default-features = false, version = "0.4.0" }
+pallet-xcm = { default-features = false, version = "4.0.0" }
 parity-scale-codec = { version = "3.6.5", features = ["derive"], default-features = false }
 polkadot-cli = "4.0.0"
-polkadot-parachain-primitives = { default-features = false , version = "3.0.0" }
-polkadot-runtime-common = { default-features = false , version = "4.0.0" }
+polkadot-parachain-primitives = { default-features = false, version = "3.0.0" }
 polkadot-primitives = "4.0.0"
+polkadot-runtime-common = { default-features = false, version = "4.0.0" }
 polkadot-service = "4.0.0"
 sc-basic-authorship = "0.31.0"
 sc-chain-spec = "24.0.0"
@@ -179,9 +178,10 @@
 sp-trie = { default-features = false, version = "26.0.0" }
 sp-version = { default-features = false, version = "26.0.0" }
 sp-weights = { default-features = false, version = "24.0.0" }
-staging-xcm = { default-features = false , version = "4.0.0" }
-staging-xcm-builder = { default-features = false , version = "4.0.0" }
-staging-xcm-executor = { default-features = false , version = "4.0.0" }
+staging-parachain-info = { default-features = false, version = "0.4.0" }
+staging-xcm = { default-features = false, version = "4.0.0" }
+staging-xcm-builder = { default-features = false, version = "4.0.0" }
+staging-xcm-executor = { default-features = false, version = "4.0.0" }
 substrate-frame-rpc-system = "25.0.0"
 substrate-prometheus-endpoint = "0.16.0"
 
@@ -216,4 +216,3 @@
 num_enum = { version = "0.7.0", default-features = false }
 serde = { default-features = false, features = ['derive'], version = "1.0.188" }
 smallvec = "1.11.1"
-
modifiedpallets/inflation/Cargo.tomldiffbeforeafterboth
--- a/pallets/inflation/Cargo.toml
+++ b/pallets/inflation/Cargo.toml
@@ -16,6 +16,7 @@
 
 [features]
 default = ['std']
+fast-inflation = []
 runtime-benchmarks = ['frame-benchmarking']
 std = [
 	'frame-benchmarking/std',
@@ -27,7 +28,6 @@
 	'sp-std/std',
 ]
 try-runtime = ["frame-support/try-runtime"]
-fast-inflation = []
 
 [dependencies]
 parity-scale-codec = { workspace = true }
modifiedruntime/common/config/substrate.rsdiffbeforeafterboth
--- a/runtime/common/config/substrate.rs
+++ b/runtime/common/config/substrate.rs
@@ -241,6 +241,8 @@
 	type Paymaster = PayFromAccount<Balances, TreasuryAccount>;
 	type BalanceConverter = UnityAssetBalanceConversion;
 	type PayoutPeriod = ConstU32<10>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 }
 
 impl pallet_sudo::Config for Runtime {
modifiedruntime/common/tests/xcm.rsdiffbeforeafterboth
--- a/runtime/common/tests/xcm.rs
+++ b/runtime/common/tests/xcm.rs
@@ -37,7 +37,7 @@
 			Box::new(VersionedXcm::from(Xcm(vec![Transact {
 				origin_kind: OriginKind::Native,
 				require_weight_at_most: Weight::from_parts(1000, 1000),
-				call: RuntimeCall::Balances(pallet_balances::Call::<Runtime>::transfer {
+				call: RuntimeCall::Balances(pallet_balances::Call::<Runtime>::transfer_keep_alive {
 					dest: BOB.into(),
 					value: INITIAL_BALANCE / 2,
 				})
modifiedruntime/opal/Cargo.tomldiffbeforeafterboth
--- a/runtime/opal/Cargo.toml
+++ b/runtime/opal/Cargo.toml
@@ -61,6 +61,7 @@
 	'pallet-unique/runtime-benchmarks',
 	'pallet-utility/runtime-benchmarks',
 	'pallet-xcm/runtime-benchmarks',
+	'polkadot-runtime-common/runtime-benchmarks',
 	'sp-runtime/runtime-benchmarks',
 	'staging-xcm-builder/runtime-benchmarks',
 ]
@@ -126,7 +127,6 @@
 	'pallet-treasury/std',
 	'pallet-unique/std',
 	'pallet-utility/std',
-	'staging-parachain-info/std',
 	'polkadot-runtime-common/std',
 	'serde',
 	'sp-api/std',
@@ -141,6 +141,7 @@
 	'sp-storage/std',
 	'sp-transaction-pool/std',
 	'sp-version/std',
+	'staging-parachain-info/std',
 	'staging-xcm-builder/std',
 	'staging-xcm-executor/std',
 	'staging-xcm/std',
@@ -221,12 +222,13 @@
 	'pallet-unique/try-runtime',
 	'pallet-utility/try-runtime',
 	'pallet-xcm/try-runtime',
+	'polkadot-runtime-common/try-runtime',
 	'staging-parachain-info/try-runtime',
-	'polkadot-runtime-common/try-runtime',
 ]
 
 app-promotion = []
 collator-selection = []
+fast-inflation = []
 foreign-assets = []
 gov-test-timings = []
 governance = []
@@ -234,7 +236,6 @@
 preimage = []
 refungible = []
 session-test-timings = []
-fast-inflation = []
 
 ################################################################################
 # local dependencies
@@ -271,7 +272,6 @@
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-xcm = { workspace = true }
-staging-parachain-info = { workspace = true }
 parity-scale-codec = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
 polkadot-runtime-common = { workspace = true }
@@ -290,6 +290,7 @@
 sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
+staging-parachain-info = { workspace = true }
 staging-xcm = { workspace = true }
 staging-xcm-builder = { workspace = true }
 staging-xcm-executor = { workspace = true }
modifiedruntime/quartz/Cargo.tomldiffbeforeafterboth
--- a/runtime/quartz/Cargo.toml
+++ b/runtime/quartz/Cargo.toml
@@ -58,6 +58,7 @@
 	'pallet-unique/runtime-benchmarks',
 	'pallet-utility/runtime-benchmarks',
 	'pallet-xcm/runtime-benchmarks',
+	'polkadot-runtime-common/runtime-benchmarks',
 	'sp-runtime/runtime-benchmarks',
 	'staging-xcm-builder/runtime-benchmarks',
 ]
@@ -126,7 +127,7 @@
 	'pallet-treasury/std',
 	'pallet-unique/std',
 	'pallet-utility/std',
-	'staging-parachain-info/std',
+	'polkadot-runtime-common/std',
 	'serde',
 	'sp-api/std',
 	'sp-block-builder/std',
@@ -139,6 +140,7 @@
 	'sp-std/std',
 	'sp-transaction-pool/std',
 	'sp-version/std',
+	'staging-parachain-info/std',
 	'staging-xcm-builder/std',
 	'staging-xcm-executor/std',
 	'staging-xcm/std',
@@ -210,18 +212,19 @@
 	'pallet-unique/try-runtime',
 	'pallet-utility/try-runtime',
 	'pallet-xcm/try-runtime',
+	'polkadot-runtime-common/try-runtime',
 	'staging-parachain-info/try-runtime',
 ]
 
 app-promotion = []
 collator-selection = []
+fast-inflation = []
 foreign-assets = []
 gov-test-timings = []
 governance = []
 preimage = []
 refungible = []
 session-test-timings = []
-fast-inflation = []
 
 ################################################################################
 # local dependencies
@@ -257,9 +260,9 @@
 pallet-treasury = { workspace = true }
 pallet-utility = { workspace = true }
 pallet-xcm = { workspace = true }
-staging-parachain-info = { workspace = true }
 parity-scale-codec = { workspace = true }
 polkadot-parachain-primitives = { workspace = true }
+polkadot-runtime-common = { workspace = true }
 smallvec = { workspace = true }
 sp-api = { workspace = true }
 sp-arithmetic = { workspace = true }
@@ -275,6 +278,7 @@
 sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true }
+staging-parachain-info = { workspace = true }
 staging-xcm = { workspace = true }
 staging-xcm-builder = { workspace = true }
 staging-xcm-executor = { workspace = true }
modifiedruntime/unique/Cargo.tomldiffbeforeafterboth
55	'pallet-unique/runtime-benchmarks',55	'pallet-unique/runtime-benchmarks',
56	'pallet-utility/runtime-benchmarks',56	'pallet-utility/runtime-benchmarks',
57	'pallet-xcm/runtime-benchmarks',57	'pallet-xcm/runtime-benchmarks',
58	'polkadot-runtime-common/runtime-benchmarks',
58	'sp-runtime/runtime-benchmarks',59	'sp-runtime/runtime-benchmarks',
59	'staging-xcm-builder/runtime-benchmarks',60	'staging-xcm-builder/runtime-benchmarks',
60	'up-data-structs/runtime-benchmarks',61	'up-data-structs/runtime-benchmarks',
124	'pallet-treasury/std',125	'pallet-treasury/std',
125	'pallet-unique/std',126	'pallet-unique/std',
126	'pallet-utility/std',127	'pallet-utility/std',
127	'staging-parachain-info/std',128	'polkadot-runtime-common/std',
128	'sp-api/std',129	'sp-api/std',
129	'sp-block-builder/std',130	'sp-block-builder/std',
130	'sp-core/std',131	'sp-core/std',
136	'sp-std/std',137	'sp-std/std',
137	'sp-transaction-pool/std',138	'sp-transaction-pool/std',
138	'sp-version/std',139	'sp-version/std',
140	'staging-parachain-info/std',
139	'staging-xcm-builder/std',141	'staging-xcm-builder/std',
140	'staging-xcm-executor/std',142	'staging-xcm-executor/std',
141	'staging-xcm/std',143	'staging-xcm/std',
212	'pallet-unique/try-runtime',214	'pallet-unique/try-runtime',
213	'pallet-utility/try-runtime',215	'pallet-utility/try-runtime',
214	'pallet-xcm/try-runtime',216	'pallet-xcm/try-runtime',
217	'polkadot-runtime-common/try-runtime',
215	'staging-parachain-info/try-runtime',218	'staging-parachain-info/try-runtime',
216]219]
217unique-runtime = ['app-promotion', 'foreign-assets', 'refungible', 'governance', 'preimage']220unique-runtime = ['app-promotion', 'foreign-assets', 'governance', 'preimage', 'refungible']
218221
219app-promotion = []222app-promotion = []
220collator-selection = []223collator-selection = []
224fast-inflation = []
221foreign-assets = []225foreign-assets = []
222gov-test-timings = []226gov-test-timings = []
223governance = []227governance = []
224preimage = []228preimage = []
225refungible = []229refungible = []
226session-test-timings = []230session-test-timings = []
227fast-inflation = []
228231
229################################################################################232################################################################################
230# local dependencies233# local dependencies
260pallet-treasury = { workspace = true }263pallet-treasury = { workspace = true }
261pallet-utility = { workspace = true }264pallet-utility = { workspace = true }
262pallet-xcm = { workspace = true }265pallet-xcm = { workspace = true }
263staging-parachain-info = { workspace = true }266parity-scale-codec = { workspace = true }
264parity-scale-codec = { workspace = true }267polkadot-parachain-primitives = { workspace = true }
265polkadot-parachain-primitives = { workspace = true }268polkadot-runtime-common = { workspace = true }
266smallvec = { workspace = true }269smallvec = { workspace = true }
267sp-api = { workspace = true }270sp-api = { workspace = true }
268sp-arithmetic = { workspace = true }271sp-arithmetic = { workspace = true }
278sp-storage = { workspace = true }281sp-storage = { workspace = true }
279sp-transaction-pool = { workspace = true }282sp-transaction-pool = { workspace = true }
280sp-version = { workspace = true }283sp-version = { workspace = true }
284staging-parachain-info = { workspace = true }
281staging-xcm = { workspace = true }285staging-xcm = { workspace = true }
282staging-xcm-builder = { workspace = true }286staging-xcm-builder = { workspace = true }
283staging-xcm-executor = { workspace = true }287staging-xcm-executor = { workspace = true }