Companion for Weight v1.5 Follow Up (#1584)

* fixes

* oopsie

* [ci] Apply cargo-fmt

* fixes

* [ci] Apply cargo-fmt

* fixes

* fix cumulus template

* fix merge

* update lockfile for {"polkadot", "substrate"}

Co-authored-by: paritytech-ci <paritytech-ci@parity.io>
Co-authored-by: parity-processbot <>
This commit is contained in:
Shawn Tabrizi
2022-09-01 20:25:05 +01:00
committed by GitHub
parent 8765c22840
commit 2c1e88522c
66 changed files with 583 additions and 565 deletions
@@ -37,8 +37,8 @@ impl WeighMultiAssets for MultiAssetFilter {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
let weight = match self {
Self::Definite(assets) =>
weight.scalar_saturating_mul(assets.inner().into_iter().count() as u64),
Self::Wild(_) => weight.scalar_saturating_mul(MAX_ASSETS as u64),
weight.saturating_mul(assets.inner().into_iter().count() as u64),
Self::Wild(_) => weight.saturating_mul(MAX_ASSETS as u64),
};
weight.ref_time()
}
@@ -46,7 +46,7 @@ impl WeighMultiAssets for MultiAssetFilter {
impl WeighMultiAssets for MultiAssets {
fn weigh_multi_assets(&self, weight: Weight) -> XCMWeight {
weight.scalar_saturating_mul(self.inner().into_iter().count() as u64).ref_time()
weight.saturating_mul(self.inner().into_iter().count() as u64).ref_time()
}
}