Skip to content

Commit 53cf041

Browse files
authored
Remove as_derivative from SafeCallFilter (#3006)
* remove as_derivative from SafeCallFilter * lock --------- Co-authored-by: parity-processbot <>
1 parent dcaff46 commit 53cf041

File tree

8 files changed

+33
-43
lines changed

8 files changed

+33
-43
lines changed

cumulus/client/pov-recovery/src/lib.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
//! It works in the following way:
3030
//!
3131
//! 1. For every included relay chain block we note the backed candidate of our parachain. If the
32-
//! block belonging to the PoV is already known, we do nothing. Otherwise we start
33-
//! a timer that waits for a randomized time inside a specified interval before starting to
32+
//! block belonging to the PoV is already known, we do nothing. Otherwise we start a timer that
33+
//! waits for a randomized time inside a specified interval before starting to
3434
//! recover the PoV.
3535
//!
3636
//! 2. If between starting and firing the timer the block is imported, we skip the recovery of the

cumulus/parachains/runtimes/assets/asset-hub-kusama/src/xcm_config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ impl Contains<RuntimeCall> for SafeCallFilter {
220220
) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
221221
RuntimeCall::XcmpQueue(..) |
222222
RuntimeCall::DmpQueue(..) |
223-
RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
224223
RuntimeCall::Assets(
225224
pallet_assets::Call::create { .. } |
226225
pallet_assets::Call::force_create { .. } |

cumulus/parachains/runtimes/assets/asset-hub-polkadot/src/xcm_config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ impl Contains<RuntimeCall> for SafeCallFilter {
227227
) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
228228
RuntimeCall::XcmpQueue(..) |
229229
RuntimeCall::DmpQueue(..) |
230-
RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
231230
RuntimeCall::Assets(
232231
pallet_assets::Call::create { .. } |
233232
pallet_assets::Call::force_create { .. } |

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

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -273,39 +273,35 @@ impl Contains<RuntimeCall> for SafeCallFilter {
273273
) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
274274
RuntimeCall::XcmpQueue(..) |
275275
RuntimeCall::DmpQueue(..) |
276-
RuntimeCall::Utility(
277-
pallet_utility::Call::as_derivative { .. } |
278-
pallet_utility::Call::batch { .. } |
279-
pallet_utility::Call::batch_all { .. },
280-
) | RuntimeCall::Assets(
281-
pallet_assets::Call::create { .. } |
282-
pallet_assets::Call::force_create { .. } |
283-
pallet_assets::Call::start_destroy { .. } |
284-
pallet_assets::Call::destroy_accounts { .. } |
285-
pallet_assets::Call::destroy_approvals { .. } |
286-
pallet_assets::Call::finish_destroy { .. } |
287-
pallet_assets::Call::mint { .. } |
288-
pallet_assets::Call::burn { .. } |
289-
pallet_assets::Call::transfer { .. } |
290-
pallet_assets::Call::transfer_keep_alive { .. } |
291-
pallet_assets::Call::force_transfer { .. } |
292-
pallet_assets::Call::freeze { .. } |
293-
pallet_assets::Call::thaw { .. } |
294-
pallet_assets::Call::freeze_asset { .. } |
295-
pallet_assets::Call::thaw_asset { .. } |
296-
pallet_assets::Call::transfer_ownership { .. } |
297-
pallet_assets::Call::set_team { .. } |
298-
pallet_assets::Call::set_metadata { .. } |
299-
pallet_assets::Call::clear_metadata { .. } |
300-
pallet_assets::Call::force_clear_metadata { .. } |
301-
pallet_assets::Call::force_asset_status { .. } |
302-
pallet_assets::Call::approve_transfer { .. } |
303-
pallet_assets::Call::cancel_approval { .. } |
304-
pallet_assets::Call::force_cancel_approval { .. } |
305-
pallet_assets::Call::transfer_approved { .. } |
306-
pallet_assets::Call::touch { .. } |
307-
pallet_assets::Call::refund { .. },
308-
) | RuntimeCall::ForeignAssets(
276+
RuntimeCall::Assets(
277+
pallet_assets::Call::create { .. } |
278+
pallet_assets::Call::force_create { .. } |
279+
pallet_assets::Call::start_destroy { .. } |
280+
pallet_assets::Call::destroy_accounts { .. } |
281+
pallet_assets::Call::destroy_approvals { .. } |
282+
pallet_assets::Call::finish_destroy { .. } |
283+
pallet_assets::Call::mint { .. } |
284+
pallet_assets::Call::burn { .. } |
285+
pallet_assets::Call::transfer { .. } |
286+
pallet_assets::Call::transfer_keep_alive { .. } |
287+
pallet_assets::Call::force_transfer { .. } |
288+
pallet_assets::Call::freeze { .. } |
289+
pallet_assets::Call::thaw { .. } |
290+
pallet_assets::Call::freeze_asset { .. } |
291+
pallet_assets::Call::thaw_asset { .. } |
292+
pallet_assets::Call::transfer_ownership { .. } |
293+
pallet_assets::Call::set_team { .. } |
294+
pallet_assets::Call::set_metadata { .. } |
295+
pallet_assets::Call::clear_metadata { .. } |
296+
pallet_assets::Call::force_clear_metadata { .. } |
297+
pallet_assets::Call::force_asset_status { .. } |
298+
pallet_assets::Call::approve_transfer { .. } |
299+
pallet_assets::Call::cancel_approval { .. } |
300+
pallet_assets::Call::force_cancel_approval { .. } |
301+
pallet_assets::Call::transfer_approved { .. } |
302+
pallet_assets::Call::touch { .. } |
303+
pallet_assets::Call::refund { .. },
304+
) | RuntimeCall::ForeignAssets(
309305
pallet_assets::Call::create { .. } |
310306
pallet_assets::Call::force_create { .. } |
311307
pallet_assets::Call::start_destroy { .. } |

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-kusama/src/xcm_config.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,7 @@ impl Contains<RuntimeCall> for SafeCallFilter {
147147
pallet_collator_selection::Call::remove_invulnerable { .. },
148148
) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
149149
RuntimeCall::XcmpQueue(..) |
150-
RuntimeCall::DmpQueue(..) |
151-
RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. })
150+
RuntimeCall::DmpQueue(..)
152151
)
153152
}
154153
}

cumulus/parachains/runtimes/bridge-hubs/bridge-hub-polkadot/src/xcm_config.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,8 +150,7 @@ impl Contains<RuntimeCall> for SafeCallFilter {
150150
pallet_collator_selection::Call::remove_invulnerable { .. },
151151
) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
152152
RuntimeCall::XcmpQueue(..) |
153-
RuntimeCall::DmpQueue(..) |
154-
RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. })
153+
RuntimeCall::DmpQueue(..)
155154
)
156155
}
157156
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,6 @@ impl Contains<RuntimeCall> for SafeCallFilter {
184184
) | RuntimeCall::Session(pallet_session::Call::purge_keys { .. }) |
185185
RuntimeCall::XcmpQueue(..) |
186186
RuntimeCall::DmpQueue(..) |
187-
RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
188187
RuntimeCall::BridgeRococoGrandpa(pallet_bridge_grandpa::Call::<
189188
Runtime,
190189
BridgeGrandpaRococoInstance,

cumulus/parachains/runtimes/collectives/collectives-polkadot/src/xcm_config.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ impl Contains<RuntimeCall> for SafeCallFilter {
160160
RuntimeCall::PolkadotXcm(pallet_xcm::Call::force_xcm_version { .. }) |
161161
RuntimeCall::XcmpQueue(..) |
162162
RuntimeCall::DmpQueue(..) |
163-
RuntimeCall::Utility(pallet_utility::Call::as_derivative { .. }) |
164163
RuntimeCall::Alliance(
165164
// `init_members` accepts unbounded vecs as arguments,
166165
// but the call can be initiated only by root origin.

0 commit comments

Comments
 (0)