fix: test to pass CI

update: more reasonable slash fraction
darwinia-network · Dec 26, 2019 · 327553c · 327553c
1 parent b4c245e
commit 327553c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/srml/im-online/src/lib.rs b/srml/im-online/src/lib.rs
@@ -77,7 +77,7 @@ use rstd::convert::TryInto;
 use rstd::prelude::*;
 use session::historical::IdentificationTuple;
 use sr_primitives::{
-	traits::{Convert, Member, Printable},
+	traits::{Convert, Member, Printable, Saturating},
 	transaction_validity::{InvalidTransaction, TransactionPriority, TransactionValidity, ValidTransaction},
 	Perbill, RuntimeDebug,
 };
@@ -626,7 +626,9 @@ impl<Offender: Clone> Offence<Offender> for UnresponsivenessOffence<Offender> {
 		self.session_index
 	}
 
-	fn slash_fraction(_offenders: u32, _validator_set_count: u32) -> Perbill {
-		Perbill::from_percent(5)
+	fn slash_fraction(offenders: u32, validator_set_count: u32) -> Perbill {
+		// the formula is min((3 * max((k - 1), 1)) / n, 1) * 0.05
+		let x = Perbill::from_rational_approximation(3 * (offenders - 1).max(1), validator_set_count);
+		x.saturating_mul(Perbill::from_percent(5))
 	}
 }
diff --git a/srml/im-online/src/mock.rs b/srml/im-online/src/mock.rs
@@ -127,7 +127,7 @@ parameter_types! {
 impl session::Trait for Runtime {
 	type ShouldEndSession = session::PeriodicSessions<Period, Offset>;
 	type OnSessionEnding = session::historical::NoteHistoricalRoot<Runtime, TestOnSessionEnding>;
-	type SessionHandler = (ImOnline);
+	type SessionHandler = (ImOnline,);
 	type ValidatorId = u64;
 	type ValidatorIdOf = ConvertInto;
 	type Keys = UintAuthorityId;

diff --git a/srml/im-online/src/tests.rs b/srml/im-online/src/tests.rs
@@ -28,7 +28,10 @@ use support::{assert_noop, dispatch};
 #[test]
 fn test_unresponsiveness_slash_fraction() {
 	// A single case of unresponsiveness is not slashed.
-	assert_eq!(UnresponsivenessOffence::<()>::slash_fraction(1, 50), Perbill::zero());
+	assert_eq!(
+		UnresponsivenessOffence::<()>::slash_fraction(1, 50),
+		Perbill::from_parts(3000000), // 0.3%
+	);
 
 	assert_eq!(
 		UnresponsivenessOffence::<()>::slash_fraction(3, 50),