From dc0bd3540013399277fbab43dfe55ddb826ce505 Mon Sep 17 00:00:00 2001 From: NachoPal Date: Mon, 16 Oct 2023 12:23:24 +0200 Subject: [PATCH] fix conflicts --- Cargo.lock | 9 --------- .../asset-hub-kusama/src/weights/pallet_assets_local.rs | 1 + .../src/weights/pallet_assets_foreign.rs | 2 +- .../asset-hub-polkadot/src/weights/pallet_nfts.rs | 2 +- 4 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 58566ef854..9ce4f24cb9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5400,15 +5400,6 @@ dependencies = [ "autocfg", ] -[[package]] -name = "memory-db" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg", -] - [[package]] name = "memory-db" version = "0.32.0" diff --git a/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs b/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs index d4713de745..4e06fa5a70 100644 --- a/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs +++ b/system-parachains/asset-hubs/asset-hub-kusama/src/weights/pallet_assets_local.rs @@ -126,6 +126,7 @@ impl pallet_assets::WeightInfo for WeightInfo { .saturating_add(T::DbWeight::get().reads(2)) .saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into()))) .saturating_add(T::DbWeight::get().writes(1)) + .saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(a.into()))) .saturating_add(Weight::from_parts(0, 2623).saturating_mul(a.into())) } /// Storage: `Assets::Asset` (r:1 w:1) diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs index 0d4d9836f7..33b0f53530 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs +++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_assets_foreign.rs @@ -305,7 +305,7 @@ impl pallet_assets::WeightInfo for WeightInfo { /// The range of component `s` is `[0, 50]`. /// The range of component `n` is `[0, 50]`. /// The range of component `s` is `[0, 50]`. - fn set_metadata(_n: u32, s: u32, ) -> Weight { + fn set_metadata(n: u32, s: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `242` // Estimated: `4273` diff --git a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_nfts.rs b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_nfts.rs index 2751694654..43774478c7 100644 --- a/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_nfts.rs +++ b/system-parachains/asset-hubs/asset-hub-polkadot/src/weights/pallet_nfts.rs @@ -104,7 +104,7 @@ impl pallet_nfts::WeightInfo for WeightInfo { /// The range of component `m` is `[0, 1000]`. /// The range of component `c` is `[0, 1000]`. /// The range of component `a` is `[0, 1000]`. - fn destroy(_m: u32, _c: u32, a: u32, ) -> Weight { + fn destroy(m: u32, _c: u32, a: u32, ) -> Weight { // Proof Size summary in bytes: // Measured: `32170 + a * (366 ±0)` // Estimated: `2523990 + a * (2954 ±0)`