merge fixes

paritytech · May 21, 2023 · 1bd8c84 · 1bd8c84
1 parent 6123d80
commit 1bd8c84
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs b/frame/election-provider-multi-phase/test-staking-e2e/src/lib.rs
@@ -290,13 +290,14 @@ fn transition_to_signed_phase_from_unsigned() {
 /// <https://github.com/paritytech/substrate/pull/12420>.
 ///
 /// Related to <https://github.com/paritytech/substrate/issues/13714>.
+#[test]
 fn set_validation_intention_after_chilled() {
 	use frame_election_provider_support::SortedListProvider;
 	use pallet_staking::{Event, Forcing, Nominators};
 
 	let staking_builder = StakingExtBuilder::default();
 	let epm_builder = EpmExtBuilder::default();
-  	ExtBuilder::default()
+	ExtBuilder::default()
 		.staking(staking_builder)
 		.epm(epm_builder)
 		.build_and_execute(|| {

diff --git a/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs b/frame/election-provider-multi-phase/test-staking-e2e/src/mock.rs
@@ -127,7 +127,6 @@ impl pallet_balances::Config for Runtime {
 	type MaxHolds = ConstU32<1>;
 	type MaxFreezes = traits::ConstU32<1>;
 	type HoldIdentifier = ();
-	type WeightInfo = ();
 	type FreezeIdentifier = ();
 	type WeightInfo = ();
 }