Skip to content

Commit 35a05df

Browse files
qiweiiigui1117bkchr
authored and
dudo50
committed
Replace duplicated whitelist with whitelisted_storage_keys (paritytech#7024)
related issue: paritytech#7018 replaced duplicated whitelists with `AllPalletsWithSystem::whitelisted_storage_keys();` in this PR --------- Co-authored-by: Guillaume Thiolliere <gui.thiolliere@gmail.com> Co-authored-by: Bastian Köcher <git@kchr.de>
1 parent d6869a1 commit 35a05df

File tree

11 files changed

+22
-136
lines changed
  • cumulus/parachains/runtimes
    • assets
    • bridge-hubs
    • collectives/collectives-westend/src
    • contracts/contracts-rococo/src
    • coretime
    • people
    • testing/penpal/src

11 files changed

+22
-136
lines changed

‎cumulus/parachains/runtimes/assets/asset-hub-rococo/src/lib.rs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1854,20 +1854,8 @@ impl_runtime_apis! {
18541854

18551855
type ToWestend = XcmBridgeHubRouterBench<Runtime, ToWestendXcmRouterInstance>;
18561856

1857-
let whitelist: Vec<TrackedStorageKey> = vec![
1858-
// Block Number
1859-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1860-
// Total Issuance
1861-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1862-
// Execution Phase
1863-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1864-
// Event Count
1865-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1866-
// System Events
1867-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1868-
//TODO: use from relay_well_known_keys::ACTIVE_CONFIG
1869-
hex_literal::hex!("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385").to_vec().into(),
1870-
];
1857+
use frame_support::traits::WhitelistedStorageKeys;
1858+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
18711859

18721860
let mut batches = Vec::<BenchmarkBatch>::new();
18731861
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/assets/asset-hub-westend/src/lib.rs‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2030,20 +2030,8 @@ impl_runtime_apis! {
20302030

20312031
type ToRococo = XcmBridgeHubRouterBench<Runtime, ToRococoXcmRouterInstance>;
20322032

2033-
let whitelist: Vec<TrackedStorageKey> = vec![
2034-
// Block Number
2035-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
2036-
// Total Issuance
2037-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
2038-
// Execution Phase
2039-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
2040-
// Event Count
2041-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
2042-
// System Events
2043-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
2044-
//TODO: use from relay_well_known_keys::ACTIVE_CONFIG
2045-
hex_literal::hex!("06de3d8a54d27e44a9d5ce189618f22db4b49d95320d9021994c850f25b8e385").to_vec().into(),
2046-
];
2033+
use frame_support::traits::WhitelistedStorageKeys;
2034+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
20472035

20482036
let mut batches = Vec::<BenchmarkBatch>::new();
20492037
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/bridge-hubs/bridge-hub-rococo/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1498,18 +1498,8 @@ impl_runtime_apis! {
14981498
}
14991499
}
15001500

1501-
let whitelist: Vec<TrackedStorageKey> = vec![
1502-
// Block Number
1503-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1504-
// Total Issuance
1505-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1506-
// Execution Phase
1507-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1508-
// Event Count
1509-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1510-
// System Events
1511-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1512-
];
1501+
use frame_support::traits::WhitelistedStorageKeys;
1502+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
15131503

15141504
let mut batches = Vec::<BenchmarkBatch>::new();
15151505
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/bridge-hubs/bridge-hub-westend/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1315,18 +1315,8 @@ impl_runtime_apis! {
13151315
}
13161316
}
13171317

1318-
let whitelist: Vec<TrackedStorageKey> = vec![
1319-
// Block Number
1320-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1321-
// Total Issuance
1322-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1323-
// Execution Phase
1324-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1325-
// Event Count
1326-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1327-
// System Events
1328-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1329-
];
1318+
use frame_support::traits::WhitelistedStorageKeys;
1319+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
13301320

13311321
let mut batches = Vec::<BenchmarkBatch>::new();
13321322
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/collectives/collectives-westend/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1139,18 +1139,8 @@ impl_runtime_apis! {
11391139
}
11401140
}
11411141

1142-
let whitelist: Vec<TrackedStorageKey> = vec![
1143-
// Block Number
1144-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1145-
// Total Issuance
1146-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1147-
// Execution Phase
1148-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1149-
// Event Count
1150-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1151-
// System Events
1152-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1153-
];
1142+
use frame_support::traits::WhitelistedStorageKeys;
1143+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
11541144

11551145
let mut batches = Vec::<BenchmarkBatch>::new();
11561146
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/contracts/contracts-rococo/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -849,18 +849,8 @@ impl_runtime_apis! {
849849
}
850850
}
851851

852-
let whitelist: Vec<TrackedStorageKey> = vec![
853-
// Block Number
854-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
855-
// Total Issuance
856-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
857-
// Execution Phase
858-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
859-
// Event Count
860-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
861-
// System Events
862-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
863-
];
852+
use frame_support::traits::WhitelistedStorageKeys;
853+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
864854

865855
let mut batches = Vec::<BenchmarkBatch>::new();
866856
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/coretime/coretime-rococo/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1140,18 +1140,8 @@ impl_runtime_apis! {
11401140
type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
11411141
type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
11421142

1143-
let whitelist: Vec<TrackedStorageKey> = vec![
1144-
// Block Number
1145-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1146-
// Total Issuance
1147-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1148-
// Execution Phase
1149-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1150-
// Event Count
1151-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1152-
// System Events
1153-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1154-
];
1143+
use frame_support::traits::WhitelistedStorageKeys;
1144+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
11551145

11561146
let mut batches = Vec::<BenchmarkBatch>::new();
11571147
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/coretime/coretime-westend/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1135,18 +1135,8 @@ impl_runtime_apis! {
11351135
type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
11361136
type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
11371137

1138-
let whitelist: Vec<TrackedStorageKey> = vec![
1139-
// Block Number
1140-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1141-
// Total Issuance
1142-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1143-
// Execution Phase
1144-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1145-
// Event Count
1146-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1147-
// System Events
1148-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1149-
];
1138+
use frame_support::traits::WhitelistedStorageKeys;
1139+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
11501140

11511141
let mut batches = Vec::<BenchmarkBatch>::new();
11521142
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/people/people-rococo/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,18 +1055,8 @@ impl_runtime_apis! {
10551055
type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
10561056
type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
10571057

1058-
let whitelist: Vec<TrackedStorageKey> = vec![
1059-
// Block Number
1060-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1061-
// Total Issuance
1062-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1063-
// Execution Phase
1064-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1065-
// Event Count
1066-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1067-
// System Events
1068-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1069-
];
1058+
use frame_support::traits::WhitelistedStorageKeys;
1059+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
10701060

10711061
let mut batches = Vec::<BenchmarkBatch>::new();
10721062
let params = (&config, &whitelist);

‎cumulus/parachains/runtimes/people/people-westend/src/lib.rs‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1055,18 +1055,8 @@ impl_runtime_apis! {
10551055
type XcmBalances = pallet_xcm_benchmarks::fungible::Pallet::<Runtime>;
10561056
type XcmGeneric = pallet_xcm_benchmarks::generic::Pallet::<Runtime>;
10571057

1058-
let whitelist: Vec<TrackedStorageKey> = vec![
1059-
// Block Number
1060-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
1061-
// Total Issuance
1062-
hex_literal::hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
1063-
// Execution Phase
1064-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
1065-
// Event Count
1066-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
1067-
// System Events
1068-
hex_literal::hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
1069-
];
1058+
use frame_support::traits::WhitelistedStorageKeys;
1059+
let whitelist: Vec<TrackedStorageKey> = AllPalletsWithSystem::whitelisted_storage_keys();
10701060

10711061
let mut batches = Vec::<BenchmarkBatch>::new();
10721062
let params = (&config, &whitelist);

0 commit comments

Comments
 (0)