Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
xlc committed Oct 25, 2023
1 parent 6bf5ff5 commit 4a2c56a
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion asset-registry/src/mock/para.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
2 changes: 1 addition & 1 deletion asset-registry/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
12 changes: 6 additions & 6 deletions traits/src/parameters.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>),
)*
}
Expand All @@ -165,7 +165,7 @@ macro_rules! define_parameters {
)]
$vis enum [<$name Key>] {
$(
#[parity_scale_codec(index = $index)]
#[codec(index = $index)]
$key_name($key_name),
)*
}
Expand All @@ -182,7 +182,7 @@ macro_rules! define_parameters {
)]
$vis enum [<$name Value>] {
$(
#[parity_scale_codec(index = $index)]
#[codec(index = $index)]
$key_name($value_type),
)*
}
Expand Down Expand Up @@ -338,7 +338,7 @@ macro_rules! define_aggregrated_parameters {
)]
$vis enum $name {
$(
#[parity_scale_codec(index = $index)]
#[codec(index = $index)]
$parameter_name($parameter_type),
)*
}
Expand All @@ -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),
)*
}
Expand All @@ -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),
)*
}
Expand Down
2 changes: 1 addition & 1 deletion xtokens/src/mock/para.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion xtokens/src/mock/para_relative_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion xtokens/src/mock/para_teleport.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion xtokens/src/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 4a2c56a

Please sign in to comment.