adjust code to updated xcmp queue

galacticcouncil · Dec 5, 2023 · 3f9cf87 · 3f9cf87
1 parent 59d451f
commit 3f9cf87
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/integration-tests/src/xcm_rate_limiter.rs b/integration-tests/src/xcm_rate_limiter.rs
@@ -247,6 +247,7 @@ fn deferred_messages_should_be_executable_by_root() {
 			basilisk_runtime::RuntimeOrigin::root(),
 			max_weight,
 			OTHER_PARA_ID.into(),
+			basilisk_runtime::MaxBucketsProcessed::get(),
 		));
 
 		let fee = basilisk_runtime::Tokens::free_balance(AUSD, &basilisk_runtime::Treasury::account_id());

diff --git a/runtime/basilisk/src/weights/xcmp_queue.rs b/runtime/basilisk/src/weights/xcmp_queue.rs
@@ -67,16 +67,17 @@ impl<T: frame_system::Config> WeightInfo for BasiliskWeight<T> {
 			.saturating_add(T::DbWeight::get().reads(1 as u64))
 			.saturating_add(T::DbWeight::get().writes(1 as u64))
 	}
-	fn service_deferred() -> Weight {
+	fn service_deferred(_b: u32) -> Weight {
 		Weight::zero()
 	}
-	fn discard_deferred_bucket() -> Weight {
+	fn discard_deferred_bucket(_m: u32) -> Weight {
 		Weight::zero()
 	}
-	fn discard_deferred_individual() -> Weight {
+	fn discard_deferred_individual(_m: u32) -> Weight {
 		Weight::zero()
 	}
-	fn try_place_in_deferred_queue() -> Weight {
+	fn try_place_in_deferred_queue(_m: u32) -> Weight {
+		// TODO: run benchmarks
 		Weight::zero()
 	}
 }
diff --git a/runtime/basilisk/src/xcm.rs b/runtime/basilisk/src/xcm.rs
@@ -164,6 +164,12 @@ impl cumulus_pallet_xcm::Config for Runtime {
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 }
 
+parameter_types! {
+	pub const MaxDeferredMessages: u32 = 20;
+	pub const MaxDeferredBuckets: u32 = 1_000;
+	pub const MaxBucketsProcessed: u32 = 3;
+}
+
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
@@ -175,8 +181,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type PriceForSiblingDelivery = ();
 	type WeightInfo = weights::xcmp_queue::BasiliskWeight<Runtime>;
 	type ExecuteDeferredOrigin = EnsureRoot<AccountId>;
-	type MaxDeferredMessages = ConstU32<100>;
-	type MaxDeferredBuckets = ConstU32<1_000>;
+	type MaxDeferredMessages = MaxDeferredMessages;
+	type MaxDeferredBuckets = MaxDeferredBuckets;
+	type MaxBucketsProcessed = MaxBucketsProcessed;
 	type RelayChainBlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
 	type XcmDeferFilter = XcmRateLimiter;
 }