From 4a721801fb7f8174933eb6a76454b656aaf4220c Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 21 Jul 2021 13:56:41 +0200 Subject: [PATCH 1/2] improve test --- bridges/modules/dispatch/src/lib.rs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/bridges/modules/dispatch/src/lib.rs b/bridges/modules/dispatch/src/lib.rs index a16cd214469e..a57b25820c08 100644 --- a/bridges/modules/dispatch/src/lib.rs +++ b/bridges/modules/dispatch/src/lib.rs @@ -397,7 +397,7 @@ mod tests { #![allow(clippy::from_over_into)] use super::*; - use frame_support::{parameter_types, weights::Weight}; + use frame_support::{parameter_types, weights::Weight, dispatch::GetDispatchInfo}; use frame_system::{EventRecord, Phase}; use sp_core::H256; use sp_runtime::{ @@ -599,9 +599,11 @@ mod tests { fn should_fail_on_weight_mismatch() { new_test_ext().execute_with(|| { let id = [0; 4]; - let mut message = - prepare_root_message(Call::System(>::remark(vec![1, 2, 3]))); + let call = Call::System(>::remark(vec![1, 2, 3])); + let call_weight = call.get_dispatch_info().weight; + let mut message = prepare_root_message(call); message.weight = 7; + assert!(call_weight != 7, "needed for test to be correct"); System::set_block_number(1); let result = Dispatch::dispatch(SOURCE_CHAIN_ID, TARGET_CHAIN_ID, id, Ok(message), |_, _| unreachable!()); @@ -615,7 +617,7 @@ mod tests { event: Event::Dispatch(call_dispatch::Event::::MessageWeightMismatch( SOURCE_CHAIN_ID, id, - 1038000, + call_weight, 7, )), topics: vec![], From f8d70b66cd39844f52b4cb116d6e2ab301d7fa89 Mon Sep 17 00:00:00 2001 From: thiolliere Date: Wed, 21 Jul 2021 22:27:30 +0200 Subject: [PATCH 2/2] better doc --- bridges/modules/dispatch/src/lib.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridges/modules/dispatch/src/lib.rs b/bridges/modules/dispatch/src/lib.rs index a57b25820c08..683dffcacf9f 100644 --- a/bridges/modules/dispatch/src/lib.rs +++ b/bridges/modules/dispatch/src/lib.rs @@ -603,7 +603,7 @@ mod tests { let call_weight = call.get_dispatch_info().weight; let mut message = prepare_root_message(call); message.weight = 7; - assert!(call_weight != 7, "needed for test to be correct"); + assert!(call_weight != 7, "needed for test to actually trigger a weight mismatch"); System::set_block_number(1); let result = Dispatch::dispatch(SOURCE_CHAIN_ID, TARGET_CHAIN_ID, id, Ok(message), |_, _| unreachable!());