From 4a2c56a095d4a87c0ebfc2948380d909243c4ed1 Mon Sep 17 00:00:00 2001 From: Bryan Chen Date: Wed, 25 Oct 2023 14:00:13 +1300 Subject: [PATCH] fix --- asset-registry/src/mock/para.rs | 2 +- asset-registry/src/tests.rs | 2 +- traits/src/parameters.rs | 12 ++++++------ xtokens/src/mock/para.rs | 2 +- xtokens/src/mock/para_relative_view.rs | 2 +- xtokens/src/mock/para_teleport.rs | 2 +- xtokens/src/tests.rs | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/asset-registry/src/mock/para.rs b/asset-registry/src/mock/para.rs index 708b2625e..d245955e6 100644 --- a/asset-registry/src/mock/para.rs +++ b/asset-registry/src/mock/para.rs @@ -19,7 +19,7 @@ use orml_traits::{ use orml_xcm_support::{IsNativeConcrete, MultiCurrencyAdapter, MultiNativeAsset}; use pallet_xcm::XcmPassthrough; use parity_scale_codec::{Decode, Encode, MaxEncodedLen}; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use sp_core::H256; use sp_runtime::{ traits::{AccountIdConversion, Convert, IdentityLookup}, diff --git a/asset-registry/src/tests.rs b/asset-registry/src/tests.rs index 8e8e1b0c8..5ccaa3142 100644 --- a/asset-registry/src/tests.rs +++ b/asset-registry/src/tests.rs @@ -11,7 +11,7 @@ use frame_support::{ }; use mock::{para::RuntimeCall, *}; use orml_traits::MultiCurrency; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use sp_runtime::{ traits::{AccountIdConversion, BadOrigin, Dispatchable}, diff --git a/traits/src/parameters.rs b/traits/src/parameters.rs index 49a7e3c5a..e47c12489 100644 --- a/traits/src/parameters.rs +++ b/traits/src/parameters.rs @@ -148,7 +148,7 @@ macro_rules! define_parameters { )] $vis enum $name { $( - #[parity_scale_codec(index = $index)] + #[codec(index = $index)] $key_name($key_name, Option<$value_type>), )* } @@ -165,7 +165,7 @@ macro_rules! define_parameters { )] $vis enum [<$name Key>] { $( - #[parity_scale_codec(index = $index)] + #[codec(index = $index)] $key_name($key_name), )* } @@ -182,7 +182,7 @@ macro_rules! define_parameters { )] $vis enum [<$name Value>] { $( - #[parity_scale_codec(index = $index)] + #[codec(index = $index)] $key_name($value_type), )* } @@ -338,7 +338,7 @@ macro_rules! define_aggregrated_parameters { )] $vis enum $name { $( - #[parity_scale_codec(index = $index)] + #[codec(index = $index)] $parameter_name($parameter_type), )* } @@ -355,7 +355,7 @@ macro_rules! define_aggregrated_parameters { )] $vis enum [<$name Key>] { $( - #[parity_scale_codec(index = $index)] + #[codec(index = $index)] $parameter_name(<$parameter_type as $crate::parameters::AggregratedKeyValue>::AggregratedKey), )* } @@ -372,7 +372,7 @@ macro_rules! define_aggregrated_parameters { )] $vis enum [<$name Value>] { $( - #[parity_scale_codec(index = $index)] + #[codec(index = $index)] $parameter_name(<$parameter_type as $crate::parameters::AggregratedKeyValue>::AggregratedValue), )* } diff --git a/xtokens/src/mock/para.rs b/xtokens/src/mock/para.rs index 4b01af854..4e812c2da 100644 --- a/xtokens/src/mock/para.rs +++ b/xtokens/src/mock/para.rs @@ -15,7 +15,7 @@ use sp_runtime::{ use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; use pallet_xcm::XcmPassthrough; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use xcm::v3::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, NativeAsset, ParentIsPreset, RelayChainAsNative, diff --git a/xtokens/src/mock/para_relative_view.rs b/xtokens/src/mock/para_relative_view.rs index 38bb3b95c..721af1303 100644 --- a/xtokens/src/mock/para_relative_view.rs +++ b/xtokens/src/mock/para_relative_view.rs @@ -15,7 +15,7 @@ use sp_runtime::{ use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; use pallet_xcm::XcmPassthrough; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use xcm::v3::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, AllowTopLevelPaidExecutionFrom, EnsureXcmOrigin, FixedWeightBounds, ParentIsPreset, diff --git a/xtokens/src/mock/para_teleport.rs b/xtokens/src/mock/para_teleport.rs index dddaad3b8..1a12c7998 100644 --- a/xtokens/src/mock/para_teleport.rs +++ b/xtokens/src/mock/para_teleport.rs @@ -15,7 +15,7 @@ use sp_runtime::{ use cumulus_primitives_core::{ChannelStatus, GetChannelInfo, ParaId}; use pallet_xcm::XcmPassthrough; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use xcm::v3::{prelude::*, Weight}; use xcm_builder::{ AccountId32Aliases, EnsureXcmOrigin, FixedWeightBounds, NativeAsset, ParentIsPreset, RelayChainAsNative, diff --git a/xtokens/src/tests.rs b/xtokens/src/tests.rs index 4fdb2b2c1..3c0806e5e 100644 --- a/xtokens/src/tests.rs +++ b/xtokens/src/tests.rs @@ -6,7 +6,7 @@ use frame_support::{assert_err, assert_noop, assert_ok, traits::Currency}; use mock::*; use orml_traits::{ConcreteFungibleAsset, MultiCurrency}; use parity_scale_codec::Encode; -use polkadot_parachain::primitives::Sibling; +use polkadot_parachain_primitives::primitives::Sibling; use sp_runtime::{traits::AccountIdConversion, AccountId32}; use xcm::{v3::OriginKind::SovereignAccount, VersionedXcm}; use xcm_simulator::TestExt;