diff --git a/runtime/acala/src/xcm_config.rs b/runtime/acala/src/xcm_config.rs index 88545256f..bdb536299 100644 --- a/runtime/acala/src/xcm_config.rs +++ b/runtime/acala/src/xcm_config.rs @@ -116,14 +116,6 @@ parameter_types! { pub const MaxInstructions: u32 = 100; pub DotPerSecond: (AssetId, u128) = (MultiLocation::parent().into(), dot_per_second()); pub AusdPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(u32::from(ParachainInfo::get())), GeneralKey(AUSD.encode())), - ).into(), - // aUSD:DOT = 40:1 - dot_per_second() * 40 - ); - pub AusdPerSecondOfCanonicalLocation: (AssetId, u128) = ( MultiLocation::new( 0, X1(GeneralKey(AUSD.encode())), @@ -132,13 +124,6 @@ parameter_types! { dot_per_second() * 40 ); pub AcaPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(u32::from(ParachainInfo::get())), GeneralKey(ACA.encode())), - ).into(), - aca_per_second() - ); - pub AcaPerSecondOfCanonicalLocation: (AssetId, u128) = ( MultiLocation::new( 0, X1(GeneralKey(ACA.encode())), @@ -153,9 +138,7 @@ pub type Trader = ( TransactionFeePoolTrader, FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfForeignAsset, ); diff --git a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs index 153d272a6..671d7198e 100644 --- a/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs +++ b/runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs @@ -649,14 +649,7 @@ fn trap_assets_larger_than_ed_works() { fees: assets, weight_limit: Limited(dollar(KSM) as u64), }, - WithdrawAsset( - ( - // (Parent, X2(Parachain(2000), GeneralKey(KAR.encode()))), - (0, GeneralKey(KAR.encode())), - kar_asset_amount, - ) - .into(), - ), + WithdrawAsset(((0, GeneralKey(KAR.encode())), kar_asset_amount).into()), ]; assert_ok!(pallet_xcm::Pallet::::send_xcm( Here, @@ -703,13 +696,7 @@ fn trap_assets_lower_than_ed_works() { fees: assets, weight_limit: Limited(dollar(KSM) as u64), }, - WithdrawAsset( - ( - (Parent, X2(Parachain(2000), GeneralKey(KAR.encode()))), - kar_asset_amount, - ) - .into(), - ), + WithdrawAsset(((0, X1(GeneralKey(KAR.encode()))), kar_asset_amount).into()), // two asset left in holding register, they both lower than ED, so goes to treasury. ]; assert_ok!(pallet_xcm::Pallet::::send_xcm( @@ -756,11 +743,7 @@ fn sibling_trap_assets_works() { }); Sibling::execute_with(|| { - let assets: MultiAsset = ( - (Parent, X2(Parachain(2000), GeneralKey(KAR.encode()))), - kar_asset_amount, - ) - .into(); + let assets: MultiAsset = ((0, X1(GeneralKey(KAR.encode()))), kar_asset_amount).into(); let xcm = vec![ WithdrawAsset(assets.clone().into()), BuyExecution { diff --git a/runtime/karura/src/integration_tests_config.rs b/runtime/karura/src/integration_tests_config.rs index a2dc14467..149e444ad 100644 --- a/runtime/karura/src/integration_tests_config.rs +++ b/runtime/karura/src/integration_tests_config.rs @@ -37,11 +37,8 @@ pub type Trader = ( TransactionFeePoolTrader, FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfFungible, FixedRateOfFungible, FixedRateOfFungible, diff --git a/runtime/karura/src/xcm_config.rs b/runtime/karura/src/xcm_config.rs index d2b3ccf9c..7f7570906 100644 --- a/runtime/karura/src/xcm_config.rs +++ b/runtime/karura/src/xcm_config.rs @@ -121,14 +121,6 @@ parameter_types! { pub const MaxInstructions: u32 = 100; pub KsmPerSecond: (AssetId, u128) = (MultiLocation::parent().into(), ksm_per_second()); pub KusdPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(u32::from(ParachainInfo::get())), GeneralKey(KUSD.encode())), - ).into(), - // kUSD:KSM = 400:1 - ksm_per_second() * 400 - ); - pub KusdPerSecondOfCanonicalLocation: (AssetId, u128) = ( MultiLocation::new( 0, X1(GeneralKey(KUSD.encode())), @@ -137,13 +129,6 @@ parameter_types! { ksm_per_second() * 400 ); pub KarPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(u32::from(ParachainInfo::get())), GeneralKey(KAR.encode())), - ).into(), - kar_per_second() - ); - pub KarPerSecondOfCanonicalLocation: (AssetId, u128) = ( MultiLocation::new( 0, X1(GeneralKey(KAR.encode())), @@ -151,14 +136,6 @@ parameter_types! { kar_per_second() ); pub LksmPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(u32::from(ParachainInfo::get())), GeneralKey(LKSM.encode())), - ).into(), - // LKSM:KSM = 10:1 - ksm_per_second() * 10 - ); - pub LksmPerSecondOfCanonicalLocation: (AssetId, u128) = ( MultiLocation::new( 0, X1(GeneralKey(LKSM.encode())), @@ -216,11 +193,8 @@ pub type Trader = ( TransactionFeePoolTrader, FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfFungible, FixedRateOfFungible, FixedRateOfFungible, diff --git a/runtime/mandala/src/xcm_config.rs b/runtime/mandala/src/xcm_config.rs index 7c82715de..09e0e11cd 100644 --- a/runtime/mandala/src/xcm_config.rs +++ b/runtime/mandala/src/xcm_config.rs @@ -116,13 +116,6 @@ parameter_types! { pub const MaxInstructions: u32 = 100; pub DotPerSecond: (AssetId, u128) = (MultiLocation::parent().into(), dot_per_second()); pub AcaPerSecond: (AssetId, u128) = ( - MultiLocation::new( - 1, - X2(Parachain(u32::from(ParachainInfo::get())), GeneralKey(ACA.encode())), - ).into(), - aca_per_second() - ); - pub AcaPerSecondOfCanonicalLocation: (AssetId, u128) = ( MultiLocation::new( 0, X1(GeneralKey(ACA.encode())), @@ -137,7 +130,6 @@ pub type Trader = ( TransactionFeePoolTrader, FixedRateOfFungible, FixedRateOfFungible, - FixedRateOfFungible, FixedRateOfForeignAsset, );