Snowfork · alistair-singh · Jun 5, 2023 · Feb 9, 2023 · Feb 10, 2023 · Feb 13, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/parachains/runtimes/assets/common/src/lib.rs b/parachains/runtimes/assets/common/src/lib.rs
@@ -17,7 +17,6 @@
 
 pub mod foreign_creators;
 pub mod fungible_conversion;
-pub mod location_conversion;
 pub mod matching;
 pub mod runtime_api;
 

diff --git a/parachains/runtimes/assets/common/src/location_conversion.rs b/parachains/runtimes/assets/common/src/location_conversion.rs
diff --git a/parachains/runtimes/assets/common/src/matching.rs b/parachains/runtimes/assets/common/src/matching.rs
@@ -104,25 +104,3 @@ impl<SelfGlobalConsensus: Get<NetworkId>> ContainsPair<MultiAsset, MultiLocation
 		}
 	}
 }
-
-/// Accepts an asset if it is from different global consensus than self plus `parents > 1`
-pub struct IsDifferentGlobalConsensusConcreteAsset<SelfGlobalConsensus>(
-	sp_std::marker::PhantomData<SelfGlobalConsensus>,
-);
-impl<SelfGlobalConsensus: Get<NetworkId>> ContainsPair<MultiAsset, MultiLocation>
-	for IsDifferentGlobalConsensusConcreteAsset<SelfGlobalConsensus>
-{
-	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
-		log::trace!(target: "xcm::contains", "IsDifferentGlobalConsensusConcreteAsset asset: {:?}, origin: {:?}", asset, origin);
-		match asset {
-			MultiAsset { id: Concrete(asset_location), .. } if asset_location.parents > 1 =>
-				match asset_location.first_interior() {
-					Some(GlobalConsensus(asset_consensus))
-						if asset_consensus != &SelfGlobalConsensus::get() =>
-						true,
-					_ => false,
-				},
-			_ => false,
-		}
-	}
-}
diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_collator_selection.rs
@@ -205,7 +205,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
 			.saturating_add(Weight::from_parts(0, 2602).saturating_mul(r.into()))
 	}
 }
diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_proxy.rs
@@ -194,7 +194,7 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	/// Storage: Proxy Proxies (r:1 w:1)
 	/// Proof: Proxy Proxies (max_values: None, max_size: Some(1241), added: 3716, mode: MaxEncodedLen)
 	/// The range of component `p` is `[1, 31]`.
-	fn create_pure(_p: u32, ) -> Weight {
+	fn create_pure(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `139`
 		//  Estimated: `4706`

diff --git a/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/statemine/src/weights/pallet_uniques.rs
@@ -119,8 +119,6 @@ impl<T: frame_system::Config> pallet_uniques::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 2647).saturating_mul(a.into()))
 			.saturating_add(Weight::from_parts(0, 2662).saturating_mul(m.into()))
 			.saturating_add(Weight::from_parts(0, 2597).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 2647).saturating_mul(a.into()))
-			.saturating_add(Weight::from_parts(0, 2662).saturating_mul(m.into()))
 	}
 	/// Storage: Uniques Asset (r:1 w:1)
 	/// Proof: Uniques Asset (max_values: None, max_size: Some(122), added: 2597, mode: MaxEncodedLen)

diff --git a/parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_generic.rs b/parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
@@ -26,17 +26,18 @@
 // target/production/polkadot-parachain
 // benchmark
 // pallet
-// --template=./templates/xcm-bench-template.hbs
-// --chain=statemine-dev
+// --steps=50
+// --repeat=20
+// --extrinsic=*
 // --execution=wasm
 // --wasm-execution=compiled
+// --heap-pages=4096
+// --json-file=/var/lib/gitlab-runner/builds/zyw4fam_/0/parity/mirrors/cumulus/.git/.artifacts/bench.json
 // --pallet=pallet_xcm_benchmarks::generic
-// --extrinsic=*
-// --steps=50
-// --repeat=20
-// --json
+// --chain=statemine-dev
 // --header=./file_header.txt
-// --output=./parachains/runtimes/assets/statemine/src/weights/xcm/pallet_xcm_benchmarks_generic.rs
+// --template=./templates/xcm-bench-template.hbs
+// --output=./parachains/runtimes/assets/statemine/src/weights/xcm/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]

diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_assets.rs
@@ -302,7 +302,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 	/// Proof: Assets Metadata (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
 	/// 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:  `243`
 		//  Estimated: `3675`
@@ -334,7 +334,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 	/// Proof: Assets Metadata (max_values: None, max_size: Some(140), added: 2615, mode: MaxEncodedLen)
 	/// The range of component `n` is `[0, 50]`.
 	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(n: u32, s: u32, ) -> Weight {
+	fn force_set_metadata(_n: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `82`
 		//  Estimated: `3675`

diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_collator_selection.rs
@@ -205,7 +205,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
+			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
 			.saturating_add(Weight::from_parts(0, 2602).saturating_mul(r.into()))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(c.into()))
 	}
 }
diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_multisig.rs
@@ -57,7 +57,7 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 		Weight::from_parts(11_977_075, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(608, 0).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(493, 0).saturating_mul(z.into()))
 	}
 	/// Storage: Multisig Multisigs (r:1 w:1)
 	/// Proof: Multisig Multisigs (max_values: None, max_size: Some(3346), added: 5821, mode: MaxEncodedLen)

diff --git a/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs b/parachains/runtimes/assets/statemint/src/weights/pallet_uniques.rs
@@ -119,8 +119,6 @@ impl<T: frame_system::Config> pallet_uniques::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(0, 2647).saturating_mul(a.into()))
 			.saturating_add(Weight::from_parts(0, 2662).saturating_mul(m.into()))
 			.saturating_add(Weight::from_parts(0, 2597).saturating_mul(n.into()))
-			.saturating_add(Weight::from_parts(0, 2662).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 2647).saturating_mul(a.into()))
 	}
 	/// Storage: Uniques Asset (r:1 w:1)
 	/// Proof: Uniques Asset (max_values: None, max_size: Some(122), added: 2597, mode: MaxEncodedLen)

diff --git a/parachains/runtimes/assets/statemint/tests/tests.rs b/parachains/runtimes/assets/statemint/tests/tests.rs
@@ -535,8 +535,7 @@ asset_test_utils::include_teleports_for_foreign_assets_works!(
 			Ok(RuntimeEvent::XcmpQueue(event)) => Some(event),
 			_ => None,
 		}
-	}),
-	1000
+	})
 );
 
 asset_test_utils::include_asset_transactor_transfer_with_local_consensus_currency_works!(

diff --git a/parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs b/parachains/runtimes/assets/westmint/src/weights/pallet_collator_selection.rs
@@ -205,7 +205,7 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for WeightIn
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
+			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
 			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(r.into()))
-			.saturating_add(Weight::from_parts(0, 2520).saturating_mul(c.into()))
 	}
 }