fix pallet-multisig tests

Author: Stephenlawrence00

substrate/frame/multisig/src/lib.rs

@@ -718,9 +718,10 @@ impl<T: Config> Pallet<T> {
 		let (call_hash, call_len, maybe_versioned_call) = match call_or_hash {
 			CallOrHash::Call(versioned_call) => {
 				// Validate the version before proceeding
-				let _ = Self::validate_and_extract_call(&versioned_call)?;
+				let call = Self::validate_and_extract_call(&versioned_call)?;
 
-				let call_hash = blake2_256(&versioned_call.encode());
+				// Hash the actual call, not the versioned wrapper
+				let call_hash = blake2_256(&call.encode());
 				let call_len = versioned_call.encode().len();
 				(call_hash, call_len, Some(versioned_call))
 			},

substrate/frame/multisig/src/tests.rs

@@ -75,6 +75,12 @@ impl Config for Test {
 	type BlockNumberProvider = frame_system::Pallet<Test>;
 }
 
+impl MaxEncodedLen for RuntimeCall {
+	fn max_encoded_len() -> usize {
+		4096
+	}
+}
+
 use pallet_balances::{Call as BalancesCall, Error as BalancesError};
 
 pub fn new_test_ext() -> TestState {
@@ -192,6 +198,7 @@ fn timepoint_checking_works() {
 			hash,
 			Weight::zero()
 		));
+		let timepoint = now();
 
 		assert_noop!(
 			Multisig::as_multi(
@@ -204,7 +211,7 @@ fn timepoint_checking_works() {
 			),
 			Error::<Test>::NoTimepoint,
 		);
-		let later = Timepoint { index: 1, ..now() };
+		let later = Timepoint { index: 1, ..timepoint };
 		assert_noop!(
 			Multisig::as_multi(
 				RuntimeOrigin::signed(2),
@@ -238,13 +245,14 @@ fn multisig_2_of_3_works() {
 			hash,
 			Weight::zero()
 		));
+		let timepoint = now();
 		assert_eq!(Balances::free_balance(6), 0);
 
 		assert_ok!(Multisig::as_multi(
 			RuntimeOrigin::signed(2),
 			2,
 			vec![1, 3],
-			Some(now()),
+			Some(timepoint),
 			call,
 			call_weight
 		));
@@ -271,11 +279,12 @@ fn multisig_3_of_3_works() {
 			hash,
 			Weight::zero()
 		));
+		let timepoint = now();
 		assert_ok!(Multisig::approve_as_multi(
 			RuntimeOrigin::signed(2),
 			3,
 			vec![1, 3],
-			Some(now()),
+			Some(timepoint),
 			hash,
 			Weight::zero()
 		));
@@ -285,7 +294,7 @@ fn multisig_3_of_3_works() {
 			RuntimeOrigin::signed(3),
 			3,
 			vec![1, 2],
-			Some(now()),
+			Some(timepoint),
 			call,
 			call_weight
 		));
@@ -424,11 +433,12 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
 			call.clone(),
 			Weight::zero()
 		));
+		let timepoint1 = now();
 		assert_ok!(Multisig::as_multi(
 			RuntimeOrigin::signed(2),
 			2,
 			vec![1, 3],
-			Some(now()),
+			Some(timepoint1),
 			call.clone(),
 			call_weight
 		));
@@ -442,19 +452,20 @@ fn multisig_2_of_3_cannot_reissue_same_call() {
 			call.clone(),
 			Weight::zero()
 		));
+		let timepoint2 = now();
 		assert_ok!(Multisig::as_multi(
 			RuntimeOrigin::signed(3),
 			2,
 			vec![1, 2],
-			Some(now()),
+			Some(timepoint2),
 			call.clone(),
 			call_weight
 		));
 
 		System::assert_last_event(
 			pallet_multisig::Event::MultisigExecuted {
 				approving: 3,
-				timepoint: now(),
+				timepoint: timepoint2,
 				multisig: multi,
 				call_hash: hash,
 				result: Err(TokenError::FundsUnavailable.into()),
@@ -675,19 +686,20 @@ fn multisig_handles_no_preimage_after_all_approve() {
 			hash,
 			Weight::zero()
 		));
+		let timepoint = now();
 		assert_ok!(Multisig::approve_as_multi(
 			RuntimeOrigin::signed(2),
 			3,
 			vec![1, 3],
-			Some(now()),
+			Some(timepoint),
 			hash,
 			Weight::zero()
 		));
 		assert_ok!(Multisig::approve_as_multi(
 			RuntimeOrigin::signed(3),
 			3,
 			vec![1, 2],
-			Some(now()),
+			Some(timepoint),
 			hash,
 			Weight::zero()
 		));
@@ -697,7 +709,7 @@ fn multisig_handles_no_preimage_after_all_approve() {
 			RuntimeOrigin::signed(3),
 			3,
 			vec![1, 2],
-			Some(now()),
+			Some(timepoint),
 			call,
 			call_weight
 		));