diff --git a/pallets/authority-members/src/tests.rs b/pallets/authority-members/src/tests.rs index 6f01e8b174e5ac4d2b95c5976f8c71f14b763ff9..32d94f544e88e99da94c429aeaed5297407a4c48 100644 --- a/pallets/authority-members/src/tests.rs +++ b/pallets/authority-members/src/tests.rs @@ -115,13 +115,13 @@ fn test_max_keys_life_rule() { assert_eq!(AuthorityMembers::online(), vec![3, 6]); assert_eq!(AuthorityMembers::member(9), None); - // Member 9 should be "deprogrammed" but still in the authorities set for 1 session + // Member 9 should be "deprogrammed" but still in the authorities set for 1 session assert_eq!(Session::queued_keys().len(), 2); assert_eq!(Session::queued_keys()[0].0, 3); assert_eq!(Session::queued_keys()[1].0, 6); assert_eq!(Session::validators(), vec![3, 6, 9]); - // Member 9 should be **effectively** out at session 6 + // Member 9 should be **effectively** out at session 6 run_to_block(31); assert_eq!(Session::current_index(), 6); assert_eq!(Session::validators(), vec![3, 6]); diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs index 3e23d5f5ad96bc02fa62fb5a5df12bfed61e8949..fa5cd7912c5dd9db7fc3ab8cbcd7499e3ef175f0 100644 --- a/runtime/common/src/lib.rs +++ b/runtime/common/src/lib.rs @@ -107,9 +107,9 @@ macro_rules! declare_session_keys { #[derive(Clone, codec::Decode, Debug, codec::Encode, Eq, PartialEq)] pub struct SessionKeysWrapper(pub SessionKeys); - impl Into<SessionKeys> for SessionKeysWrapper { - fn into(self) -> SessionKeys { - self.0 + impl From<SessionKeysWrapper> for SessionKeys { + fn from(keys_wrapper: SessionKeysWrapper) -> SessionKeys { + keys_wrapper.0 } }