Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Commit

Permalink
reshuffle abstractions
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruseinov
ruseinov committed Sep 19, 2022
1 parent 4901fe3 commit 81ea3be
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 33 deletions.
22 changes: 11 additions & 11 deletions parachains/runtimes/assets/statemine/src/weights/xcm/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@ trait WeighMultiAssets {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight;
}

trait WeighMultiAssetsTeleport {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight;
trait WeighMultiAssetsReserve {
fn weigh_multi_assets_reserve(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 100;
const TELEPORT_MAX_ASSETS: u32 = 1;
const RESERVE_MAX_ASSETS: u32 = 100;
const MAX_ASSETS: u32 = 1;

impl WeighMultiAssets for MultiAssetFilter {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, MAX_ASSETS)
}
}

impl WeighMultiAssetsTeleport for MultiAssetFilter {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, TELEPORT_MAX_ASSETS)
impl WeighMultiAssetsReserve for MultiAssetFilter {
fn weigh_multi_assets_reserve(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, RESERVE_MAX_ASSETS)
}
}

Expand Down Expand Up @@ -135,15 +135,15 @@ impl<Call> XcmWeightInfo<Call> for StatemineXcmWeight<Call> {
_max_assets: &u32,
_dest: &MultiLocation,
) -> XCMWeight {
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::deposit_asset())
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
}
fn deposit_reserve_asset(
assets: &MultiAssetFilter,
_max_assets: &u32,
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
assets.weigh_multi_assets_reserve(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
}
fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets) -> XCMWeight {
Weight::MAX.ref_time()
Expand All @@ -153,14 +153,14 @@ impl<Call> XcmWeightInfo<Call> for StatemineXcmWeight<Call> {
_reserve: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmGeneric::<Runtime>::initiate_reserve_withdraw())
assets.weigh_multi_assets_reserve(XcmGeneric::<Runtime>::initiate_reserve_withdraw())
}
fn initiate_teleport(
assets: &MultiAssetFilter,
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::initiate_teleport())
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
}
fn query_holding(
_query_id: &u64,
Expand Down
22 changes: 11 additions & 11 deletions parachains/runtimes/assets/statemint/src/weights/xcm/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@ trait WeighMultiAssets {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight;
}

trait WeighMultiAssetsTeleport {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight;
trait WeighMultiAssetsReserve {
fn weigh_multi_assets_reserve(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 100;
const TELEPORT_MAX_ASSETS: u32 = 1;
const RESERVE_MAX_ASSETS: u32 = 100;
const MAX_ASSETS: u32 = 1;

impl WeighMultiAssets for MultiAssetFilter {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, MAX_ASSETS)
}
}

impl WeighMultiAssetsTeleport for MultiAssetFilter {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, TELEPORT_MAX_ASSETS)
impl WeighMultiAssetsReserve for MultiAssetFilter {
fn weigh_multi_assets_reserve(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, RESERVE_MAX_ASSETS)
}
}

Expand Down Expand Up @@ -135,15 +135,15 @@ impl<Call> XcmWeightInfo<Call> for StatemintXcmWeight<Call> {
_max_assets: &u32,
_dest: &MultiLocation,
) -> XCMWeight {
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::deposit_asset())
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
}
fn deposit_reserve_asset(
assets: &MultiAssetFilter,
_max_assets: &u32,
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
assets.weigh_multi_assets_reserve(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
}
fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets) -> XCMWeight {
Weight::MAX.ref_time()
Expand All @@ -153,14 +153,14 @@ impl<Call> XcmWeightInfo<Call> for StatemintXcmWeight<Call> {
_reserve: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmGeneric::<Runtime>::initiate_reserve_withdraw())
assets.weigh_multi_assets_reserve(XcmGeneric::<Runtime>::initiate_reserve_withdraw())
}
fn initiate_teleport(
assets: &MultiAssetFilter,
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::initiate_teleport())
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
}
fn query_holding(
_query_id: &u64,
Expand Down
22 changes: 11 additions & 11 deletions parachains/runtimes/assets/westmint/src/weights/xcm/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,22 +43,22 @@ trait WeighMultiAssets {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight;
}

trait WeighMultiAssetsTeleport {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight;
trait WeighMultiAssetsReserve {
fn weigh_multi_assets_reserve(&self, weight: Weight) -> XCMWeight;
}

const MAX_ASSETS: u32 = 100;
const TELEPORT_MAX_ASSETS: u32 = 1;
const RESERVE_MAX_ASSETS: u32 = 100;
const MAX_ASSETS: u32 = 1;

impl WeighMultiAssets for MultiAssetFilter {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, MAX_ASSETS)
}
}

impl WeighMultiAssetsTeleport for MultiAssetFilter {
fn weigh_multi_assets_teleport(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, TELEPORT_MAX_ASSETS)
impl WeighMultiAssetsReserve for MultiAssetFilter {
fn weigh_multi_assets_reserve(&self, weight: Weight) -> XCMWeight {
weigh_multi_assets_generic(self, weight, RESERVE_MAX_ASSETS)
}
}

Expand Down Expand Up @@ -135,15 +135,15 @@ impl<Call> XcmWeightInfo<Call> for WestmintXcmWeight<Call> {
_max_assets: &u32,
_dest: &MultiLocation,
) -> XCMWeight {
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::deposit_asset())
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_asset())
}
fn deposit_reserve_asset(
assets: &MultiAssetFilter,
_max_assets: &u32,
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
assets.weigh_multi_assets_reserve(XcmFungibleWeight::<Runtime>::deposit_reserve_asset())
}
fn exchange_asset(_give: &MultiAssetFilter, _receive: &MultiAssets) -> XCMWeight {
Weight::MAX.ref_time()
Expand All @@ -153,14 +153,14 @@ impl<Call> XcmWeightInfo<Call> for WestmintXcmWeight<Call> {
_reserve: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets(XcmGeneric::<Runtime>::initiate_reserve_withdraw())
assets.weigh_multi_assets_reserve(XcmGeneric::<Runtime>::initiate_reserve_withdraw())
}
fn initiate_teleport(
assets: &MultiAssetFilter,
_dest: &MultiLocation,
_xcm: &Xcm<()>,
) -> XCMWeight {
assets.weigh_multi_assets_teleport(XcmFungibleWeight::<Runtime>::initiate_teleport())
assets.weigh_multi_assets(XcmFungibleWeight::<Runtime>::initiate_teleport())
}
fn query_holding(
_query_id: &u64,
Expand Down

0 comments on commit 81ea3be

Please sign in to comment.