fix mocking rewards

paritytech · paritytech-processbot · Sep 20, 2022 · May 6, 2022 · May 9, 2022 · May 11, 2022
commit b436249a0fdd91d1ad399102e75b65948ad93970
diff --git a/runtime/parachains/src/disputes/tests.rs b/runtime/parachains/src/disputes/tests.rs
@@ -20,7 +20,7 @@ use crate::{
 	disputes::DisputesHandler,
 	mock::{
 		new_test_ext, AccountId, AllPalletsWithSystem, Initializer, MockGenesisConfig, System,
-		Test, PUNISH_VALIDATORS_AGAINST, PUNISH_VALIDATORS_FOR,
+		Test, PUNISH_VALIDATORS_AGAINST, PUNISH_VALIDATORS_FOR, REWARD_VALIDATORS,
 	},
 };
 use assert_matches::assert_matches;
@@ -1266,6 +1266,22 @@ fn test_provide_multi_dispute_success_and_other() {
 		Pallet::<Test>::note_included(4, candidate_hash.clone(), 4);
 		assert_eq!(SpamSlots::<Test>::get(4), Some(vec![0, 0, 0, 0, 0, 0, 0]));
 
+		// Ensure the `reward_validator` function was correctly called
+		assert_eq!(
+			REWARD_VALIDATORS.with(|r| r.borrow().clone()),
+			vec![
+				(3, vec![ValidatorIndex(0), ValidatorIndex(2)]),
+				(4, vec![ValidatorIndex(2), ValidatorIndex(3)]),
+				(3, vec![ValidatorIndex(3)]),
+				(3, vec![ValidatorIndex(5)]),
+				(5, vec![ValidatorIndex(2), ValidatorIndex(5)]),
+				(3, vec![ValidatorIndex(6)]),
+				(5, vec![ValidatorIndex(6)]),
+				(5, vec![ValidatorIndex(0), ValidatorIndex(1), ValidatorIndex(4)]),
+				(3, vec![ValidatorIndex(1), ValidatorIndex(4)]),
+			],
+		);
+
 		// Ensure punishment against is called
 		assert_eq!(
 			PUNISH_VALIDATORS_AGAINST.with(|r| r.borrow().clone()),

diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs
@@ -242,16 +242,26 @@ impl crate::hrmp::Config for Test {
 
 impl crate::disputes::Config for Test {
 	type Event = Event;
-	type RewardValidators = ();
+	type RewardValidators = Self;
 	type SlashingHandler = Self;
 	type WeightInfo = crate::disputes::TestWeightInfo;
 }
 
 thread_local! {
+	pub static REWARD_VALIDATORS: RefCell<Vec<(SessionIndex, Vec<ValidatorIndex>)>> = RefCell::new(Vec::new());
 	pub static PUNISH_VALIDATORS_FOR: RefCell<Vec<(SessionIndex, Vec<ValidatorIndex>)>> = RefCell::new(Vec::new());
 	pub static PUNISH_VALIDATORS_AGAINST: RefCell<Vec<(SessionIndex, Vec<ValidatorIndex>)>> = RefCell::new(Vec::new());
 }
 
+impl crate::disputes::RewardValidators for Test {
+	fn reward_dispute_statement(
+		session: SessionIndex,
+		validators: impl IntoIterator<Item = ValidatorIndex>,
+	) {
+		REWARD_VALIDATORS.with(|r| r.borrow_mut().push((session, validators.into_iter().collect())))
+	}
+}
+
 impl crate::disputes::SlashingHandler<BlockNumber> for Test {
 	fn punish_for_invalid(
 		session: SessionIndex,
@@ -271,7 +281,7 @@ impl crate::disputes::SlashingHandler<BlockNumber> for Test {
 	}
 
 	fn initializer_initialize(_now: BlockNumber) -> Weight {
-		0
+		Weight::new()
 	}
 
 	fn initializer_finalize() {}