Skip to content

remove legacy trader location #1920

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xlc merged 1 commit into from
Feb 27, 2022
Merged

remove legacy trader location #1920

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions runtime/acala/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
Expand All @@ -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())),
Expand All @@ -153,9 +138,7 @@ pub type Trader = (
TransactionFeePoolTrader<Runtime, CurrencyIdConvert, AcaPerSecondAsBased, ToTreasury>,
FixedRateOfFungible<DotPerSecond, ToTreasury>,
FixedRateOfFungible<AusdPerSecond, ToTreasury>,
FixedRateOfFungible<AusdPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<AcaPerSecond, ToTreasury>,
FixedRateOfFungible<AcaPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfForeignAsset<Runtime, ForeignAssetUnitsPerSecond, ToTreasury>,
);

Expand Down
23 changes: 3 additions & 20 deletions runtime/integration-tests/src/relaychain/kusama_cross_chain_transfer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::<kusama_runtime::Runtime>::send_xcm(
Here,
Expand Down Expand Up @@ -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::<kusama_runtime::Runtime>::send_xcm(
Expand Down Expand Up @@ -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 {
Expand Down
3 changes: 0 additions & 3 deletions runtime/karura/src/integration_tests_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,8 @@ pub type Trader = (
TransactionFeePoolTrader<Runtime, CurrencyIdConvert, KarPerSecondAsBased, ToTreasury>,
FixedRateOfFungible<KsmPerSecond, ToTreasury>,
FixedRateOfFungible<KusdPerSecond, ToTreasury>,
FixedRateOfFungible<KusdPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<KarPerSecond, ToTreasury>,
FixedRateOfFungible<KarPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<LksmPerSecond, ToTreasury>,
FixedRateOfFungible<LksmPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<BncPerSecond, ToTreasury>,
FixedRateOfFungible<BncPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<VsksmPerSecond, ToTreasury>,
Expand Down
26 changes: 0 additions & 26 deletions runtime/karura/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
Expand All @@ -137,28 +129,13 @@ 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())),
).into(),
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())),
Expand Down Expand Up @@ -216,11 +193,8 @@ pub type Trader = (
TransactionFeePoolTrader<Runtime, CurrencyIdConvert, KarPerSecondAsBased, ToTreasury>,
FixedRateOfFungible<KsmPerSecond, ToTreasury>,
FixedRateOfFungible<KusdPerSecond, ToTreasury>,
FixedRateOfFungible<KusdPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<KarPerSecond, ToTreasury>,
FixedRateOfFungible<KarPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<LksmPerSecond, ToTreasury>,
FixedRateOfFungible<LksmPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfFungible<BncPerSecond, ToTreasury>,
FixedRateOfFungible<VsksmPerSecond, ToTreasury>,
FixedRateOfFungible<PHAPerSecond, ToTreasury>,
Expand Down
8 changes: 0 additions & 8 deletions runtime/mandala/src/xcm_config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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())),
Expand All @@ -137,7 +130,6 @@ pub type Trader = (
TransactionFeePoolTrader<Runtime, CurrencyIdConvert, AcaPerSecondAsBased, ToTreasury>,
FixedRateOfFungible<DotPerSecond, ToTreasury>,
FixedRateOfFungible<AcaPerSecond, ToTreasury>,
FixedRateOfFungible<AcaPerSecondOfCanonicalLocation, ToTreasury>,
FixedRateOfForeignAsset<Runtime, ForeignAssetUnitsPerSecond, ToTreasury>,
);

Expand Down