diff --git a/runtime/gdev/tests/integration_tests.rs b/runtime/gdev/tests/integration_tests.rs index 8bd1bec09ed89d65964cb9a906f259041d7b557c..fa700844761e49eaa732756378ea805f4f2d9c0e 100644 --- a/runtime/gdev/tests/integration_tests.rs +++ b/runtime/gdev/tests/integration_tests.rs @@ -23,7 +23,6 @@ use frame_support::traits::{Get, PalletInfo, StorageInfo, StorageInfoTrait}; use frame_support::{assert_noop, assert_ok}; use frame_support::{StorageHasher, Twox128}; use gdev_runtime::*; -use pallet_duniter_wot::IdtyRemovalWotReason; use pallet_membership::MembershipRemovalReason; use sp_core::Encode; use sp_keyring::AccountKeyring; diff --git a/runtime/gdev/tests/offences_tests.rs b/runtime/gdev/tests/offences_tests.rs index 5a708b6dcc6b414796d73754bcd6db085ff16959..3e9fdbd5e49380aaa69f7babb61a40eb95c59bc1 100644 --- a/runtime/gdev/tests/offences_tests.rs +++ b/runtime/gdev/tests/offences_tests.rs @@ -29,38 +29,45 @@ use sp_staking::offence::ReportOffence; #[test] fn test_imonline_offence() { ExtBuilder::new(1, 3, 4).build().execute_with(|| { - run_to_block(1); - let session_index = Session::current_index(); - let current_validators= <Runtime as pallet_im_online::Config>::ValidatorSet::validators(); - // Construct an offence where all validators (member: 1) are offenders - let offenders = current_validators - .into_iter() - .enumerate() - .filter_map(|(_, id)| { - <<Runtime as pallet_im_online::Config>::ValidatorSet as ValidatorSetWithIdentification<sp_runtime::AccountId32>>::IdentificationOf::convert( - id.clone() - ).map(|full_id| (id, full_id)) - }) - .collect::<Vec<IdentificationTuple<Runtime>>>(); - let keys = ImOnline::keys(); - let validator_set_count = keys.len() as u32; - let offence = UnresponsivenessOffence { session_index, validator_set_count, offenders }; - assert_ok!(<Runtime as pallet_im_online::Config>::ReportUnresponsiveness::report_offence(vec![], offence)); - // An offence is deposited - System::assert_has_event(RuntimeEvent::Offences( - pallet_offences::Event::Offence { - kind: *b"im-online:offlin", - timeslot: vec![0, 0, 0, 0], - }, - )); - // Offenders are punished + run_to_block(1); + let session_index = Session::current_index(); + let current_validators = <Runtime as pallet_im_online::Config>::ValidatorSet::validators(); + // Construct an offence where all validators (member: 1) are offenders + type ImOnline = pallet_im_online::Config; + let offenders = current_validatorc + .into_iter() + .enumerate() + .filter_map(|(_, id)| { + <<Runtime as ImOnline>::ValidatorSet as ValidatorSetWithIdentification< + sp_runtime::AccountId32, + >>::IdentificationOf::convert(id.clone()) + .map(|full_id| (id, full_id)) + }) + .collect::<Vec<IdentificationTuple<Runtime>>>(); + let keys = ImOnline::keys(); + let validator_set_count = keys.len() as u32; + let offence = UnresponsivenessOffence { + session_index, + validator_set_count, + offenders, + }; + assert_ok!( + <Runtime as pallet_im_online::Config>::ReportUnresponsiveness::report_offence( + vec![], + offence + ) + ); + // An offence is deposited + System::assert_has_event(RuntimeEvent::Offences(pallet_offences::Event::Offence { + kind: *b"im-online:offlin", + timeslot: vec![0, 0, 0, 0], + })); + // Offenders are punished System::assert_has_event(RuntimeEvent::AuthorityMembers( - pallet_authority_members::Event::MemberGoOffline { - member: 1 - }, + pallet_authority_members::Event::MemberGoOffline { member: 1 }, )); - assert_eq!(AuthorityMembers::blacklist().len(), 0); - }) + assert_eq!(AuthorityMembers::blacklist().len(), 0); + }) } #[test] fn test_grandpa_offence() {