diff --git a/polkadot/runtime/test-runtime/src/lib.rs b/polkadot/runtime/test-runtime/src/lib.rs index df643265e820df2a623c323f2304e85639903c5a..a8f6f384cb8d0ec1026713049adb60b14a89a12d 100644 --- a/polkadot/runtime/test-runtime/src/lib.rs +++ b/polkadot/runtime/test-runtime/src/lib.rs @@ -35,7 +35,10 @@ use polkadot_runtime_parachains::{ use authority_discovery_primitives::AuthorityId as AuthorityDiscoveryId; use beefy_primitives::crypto::AuthorityId as BeefyId; -use frame_support::{construct_runtime, parameter_types, traits::KeyOwnerProofSystem}; +use frame_support::{ + construct_runtime, parameter_types, + traits::{Everything, KeyOwnerProofSystem}, +}; use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId}; use pallet_mmr_primitives as mmr; use pallet_session::historical as session_historical; @@ -505,13 +508,10 @@ impl pallet_xcm::Config for Runtime { type SendXcmOrigin = xcm_builder::EnsureXcmOrigin<Origin, LocalOriginToLocation>; type Weigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, Call>; type XcmRouter = xcm_config::DoNothingRouter; - type XcmExecuteFilter = - frame_support::traits::All<(xcm::latest::MultiLocation, xcm::latest::Xcm<Call>)>; + type XcmExecuteFilter = Everything; type XcmExecutor = xcm_executor::XcmExecutor<xcm_config::XcmConfig>; - type XcmTeleportFilter = - frame_support::traits::All<(xcm::latest::MultiLocation, Vec<xcm::latest::MultiAsset>)>; - type XcmReserveTransferFilter = - frame_support::traits::All<(xcm::latest::MultiLocation, Vec<xcm::latest::MultiAsset>)>; + type XcmTeleportFilter = Everything; + type XcmReserveTransferFilter = Everything; } impl parachains_hrmp::Config for Runtime { diff --git a/polkadot/runtime/test-runtime/src/xcm_config.rs b/polkadot/runtime/test-runtime/src/xcm_config.rs index deaaef47ed04288e99aceb5417cd495f60e24cfe..a87e8730c746b772a692b72180cd8a8020a1bd1a 100644 --- a/polkadot/runtime/test-runtime/src/xcm_config.rs +++ b/polkadot/runtime/test-runtime/src/xcm_config.rs @@ -14,7 +14,7 @@ // You should have received a copy of the GNU General Public License // along with Polkadot. If not, see <http://www.gnu.org/licenses/>. -use frame_support::{parameter_types, traits::All, weights::Weight}; +use frame_support::{parameter_types, traits::Everything, weights::Weight}; use xcm::latest::{ Error as XcmError, Junction::*, MultiAsset, MultiLocation, MultiLocation::*, NetworkId, Result as XcmResult, SendXcm, Xcm, @@ -43,7 +43,7 @@ impl SendXcm for DoNothingRouter { } } -pub type Barrier = AllowUnpaidExecutionFrom<All<MultiLocation>>; +pub type Barrier = AllowUnpaidExecutionFrom<Everything>; pub struct DummyAssetTransactor; impl TransactAsset for DummyAssetTransactor {