Skip to content

Commit c4aa18c

Browse files
juangirinijuangirini
authored
Companion: restructure macro related exports (#7626)
* move RuntimeDebug out of frame_support * move RuntimeDebug out of frame_support * fix xcm export * ".git/.scripts/commands/fmt/fmt.sh" * fix xcm intefration tests * fix cargo lock for xcm intefration tests * wip * restructure benchmarking macro related exports * update cargo lock --------- Co-authored-by: parity-processbot <>
1 parent 7c45613 commit c4aa18c

File tree

12 files changed

+27
-12
lines changed

12 files changed

+27
-12
lines changed

‎polkadot/Cargo.lock‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎polkadot/runtime/kusama/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
3434
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3535
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3636
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
37+
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3738
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3839
tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3940
block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

‎polkadot/runtime/kusama/src/lib.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ use frame_support::{
6767
PrivilegeCmp, ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
6868
},
6969
weights::{ConstantMultiplier, WeightMeter},
70-
PalletId, RuntimeDebug,
70+
PalletId,
7171
};
7272
use frame_system::EnsureRoot;
7373
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
@@ -82,7 +82,7 @@ use sp_runtime::{
8282
Keccak256, OpaqueKeys, SaturatedConversion, Verify,
8383
},
8484
transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
85-
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
85+
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
8686
};
8787
use sp_staking::SessionIndex;
8888
#[cfg(any(feature = "std", test))]
@@ -2330,7 +2330,8 @@ sp_api::impl_runtime_apis! {
23302330
sp_runtime::RuntimeString,
23312331
> {
23322332
use frame_support::traits::WhitelistedStorageKeys;
2333-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
2333+
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
2334+
use sp_storage::TrackedStorageKey;
23342335
// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
23352336
// To get around that, we separated the benchmarks into its own crate.
23362337
use pallet_session_benchmarking::Pallet as SessionBench;

‎polkadot/runtime/polkadot/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
3333
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3434
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3535
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
36+
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3637
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3738
sp-npos-elections = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3839

‎polkadot/runtime/polkadot/src/lib.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ use frame_support::{
5151
ProcessMessage, ProcessMessageError, WithdrawReasons,
5252
},
5353
weights::{ConstantMultiplier, WeightMeter},
54-
PalletId, RuntimeDebug,
54+
PalletId,
5555
};
5656
use frame_system::EnsureRoot;
5757
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
@@ -78,7 +78,7 @@ use sp_runtime::{
7878
OpaqueKeys, SaturatedConversion, Verify,
7979
},
8080
transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
81-
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
81+
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
8282
};
8383
use sp_staking::SessionIndex;
8484
use sp_std::{cmp::Ordering, collections::btree_map::BTreeMap, prelude::*};
@@ -2077,7 +2077,8 @@ sp_api::impl_runtime_apis! {
20772077
sp_runtime::RuntimeString,
20782078
> {
20792079
use frame_support::traits::WhitelistedStorageKeys;
2080-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
2080+
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
2081+
use sp_storage::TrackedStorageKey;
20812082
// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
20822083
// To get around that, we separated the benchmarks into its own crate.
20832084
use pallet_session_benchmarking::Pallet as SessionBench;

‎polkadot/runtime/rococo/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
3030
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3131
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3232
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
33+
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3334
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3435
tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3536
block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

‎polkadot/runtime/rococo/src/lib.rs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ use frame_support::{
6464
PrivilegeCmp, ProcessMessage, ProcessMessageError, StorageMapShim, WithdrawReasons,
6565
},
6666
weights::{ConstantMultiplier, WeightMeter},
67-
PalletId, RuntimeDebug,
67+
PalletId,
6868
};
6969
use frame_system::EnsureRoot;
7070
use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
@@ -79,7 +79,7 @@ use sp_runtime::{
7979
Extrinsic as ExtrinsicT, Keccak256, OpaqueKeys, SaturatedConversion, Verify,
8080
},
8181
transaction_validity::{TransactionPriority, TransactionSource, TransactionValidity},
82-
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill,
82+
ApplyExtrinsicResult, FixedU128, KeyTypeId, Perbill, Percent, Permill, RuntimeDebug,
8383
};
8484
use sp_staking::SessionIndex;
8585
#[cfg(any(feature = "std", test))]
@@ -2114,9 +2114,10 @@ sp_api::impl_runtime_apis! {
21142114
sp_runtime::RuntimeString,
21152115
> {
21162116
use frame_support::traits::WhitelistedStorageKeys;
2117-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
2117+
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
21182118
use frame_system_benchmarking::Pallet as SystemBench;
21192119
use frame_benchmarking::baseline::Pallet as Baseline;
2120+
use sp_storage::TrackedStorageKey;
21202121
use xcm::latest::prelude::*;
21212122
use xcm_config::{
21222123
LocalCheckAccount, LocationConverter, Rockmine, TokenLocation, XcmConfig,

‎polkadot/runtime/westend/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master
3131
sp-staking = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3232
sp-core = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3333
sp-session = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
34+
sp-storage = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3435
sp-version = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3536
tx-pool-api = { package = "sp-transaction-pool", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
3637
block-builder-api = { package = "sp-block-builder", git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }

‎polkadot/runtime/westend/src/lib.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2006,7 +2006,8 @@ sp_api::impl_runtime_apis! {
20062006
sp_runtime::RuntimeString,
20072007
> {
20082008
use frame_support::traits::WhitelistedStorageKeys;
2009-
use frame_benchmarking::{Benchmarking, BenchmarkBatch, TrackedStorageKey, BenchmarkError};
2009+
use frame_benchmarking::{Benchmarking, BenchmarkBatch, BenchmarkError};
2010+
use sp_storage::TrackedStorageKey;
20102011
// Trying to add benchmarks directly to some pallets caused cyclic dependency issues.
20112012
// To get around that, we separated the benchmarks into its own crate.
20122013
use pallet_session_benchmarking::Pallet as SessionBench;

‎polkadot/xcm/xcm-executor/integration-tests/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ version.workspace = true
88
publish = false
99

1010
[dependencies]
11+
codec = { package = "parity-scale-codec", version = "3.6.1" }
1112
frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
1213
frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
1314
futures = "0.3.21"

0 commit comments

Comments
 (0)