fix compile issues

galacticcouncil · Oct 20, 2023 · 1d8f646 · 1d8f646
1 parent 91ee6ea
commit 1d8f646
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 26 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/integration-tests/parachain-runtime-mock/src/lib.rs b/integration-tests/parachain-runtime-mock/src/lib.rs
@@ -231,6 +231,7 @@ impl cumulus_pallet_xcmp_queue::Config for ParachainRuntime {
 	type WeightInfo = ();
 	type ExecuteDeferredOrigin = EnsureRoot<AccountId>;
 	type MaxDeferredMessages = ConstU32<100>;
+	type MaxDeferredBuckets = ConstU32<1000>;
 	type RelayChainBlockNumberProvider = RelayChainBlockNumberProvider<ParachainRuntime>;
 	type XcmDeferFilter = ();
 }

diff --git a/integration-tests/src/xcm_rate_limiter.rs b/integration-tests/src/xcm_rate_limiter.rs
@@ -88,6 +88,8 @@ fn xcm_rate_limiter_should_limit_aca_when_limit_is_exceeded() {
 				sent_at: 3,
 				deferred_to: basilisk_runtime::DeferDuration::get() + 4,
 				message_hash,
+				index: (basilisk_runtime::DeferDuration::get() + 4, 0),
+				position: 0,
 			}
 			.into(),
 			pallet_relaychain_info::Event::CurrentBlockNumbers {
@@ -226,6 +228,8 @@ fn deferred_messages_should_be_executable_by_root() {
 				sent_at: 3,
 				deferred_to: basilisk_runtime::DeferDuration::get() + 4,
 				message_hash,
+				index: (basilisk_runtime::DeferDuration::get() + 4, 0),
+				position: 0,
 			}
 			.into(),
 			pallet_relaychain_info::Event::CurrentBlockNumbers {

diff --git a/runtime/basilisk/src/weights/xcmp_queue.rs b/runtime/basilisk/src/weights/xcmp_queue.rs
@@ -85,7 +85,22 @@ impl<T: frame_system::Config> WeightInfo for BasiliskWeight<T> {
 	}
 	// Storage: XcmpQueue DeferredXcmMessages (r:1 w:1)
 	// Proof Skipped: XcmpQueue DeferredXcmMessages (max_values: None, max_size: None, mode: Measured)
-	fn discard_deferred() -> Weight {
+	fn discard_deferred_bucket() -> Weight {
+		// Minimum execution time: 125_025_318 nanoseconds.
+		Weight::from_ref_time(125_304_870_000 as u64)
+			.saturating_add(T::DbWeight::get().reads(1 as u64))
+			.saturating_add(T::DbWeight::get().writes(1 as u64))
+	}
+	// Storage: XcmpQueue DeferredXcmMessages (r:1 w:1)
+	// Proof Skipped: XcmpQueue DeferredXcmMessages (max_values: None, max_size: None, mode: Measured)
+	fn discard_deferred_individual() -> Weight {
+		// Minimum execution time: 125_025_318 nanoseconds.
+		Weight::from_ref_time(125_304_870_000 as u64)
+			.saturating_add(T::DbWeight::get().reads(1 as u64))
+			.saturating_add(T::DbWeight::get().writes(1 as u64))
+	}
+
+	fn try_place_in_deferred_queue() -> Weight {
 		// Minimum execution time: 125_025_318 nanoseconds.
 		Weight::from_ref_time(125_304_870_000 as u64)
 			.saturating_add(T::DbWeight::get().reads(1 as u64))

diff --git a/runtime/basilisk/src/xcm.rs b/runtime/basilisk/src/xcm.rs
@@ -188,6 +188,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type WeightInfo = weights::xcmp_queue::BasiliskWeight<Runtime>;
 	type ExecuteDeferredOrigin = EnsureRoot<AccountId>;
 	type MaxDeferredMessages = ConstU32<100>;
+	type MaxDeferredBuckets = ConstU32<1000>;
 	type RelayChainBlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
 	type XcmDeferFilter = XcmRateLimiter;
 }