From 1bd8c84b5f3da69c773f6fe7c94c274671af1e0e Mon Sep 17 00:00:00 2001
From: Sergej Sakac <sakacszergej@gmail.com>
Date: Sun, 21 May 2023 16:56:14 +0200
Subject: [PATCH] merge fixes

---
 .../election-provider-multi-phase/test-staking-e2e/src/lib.rs  | 3 ++-
 .../election-provider-multi-phase/test-staking-e2e/src/mock.rs | 1 -
 2 files changed, 2 insertions(+), 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
index 28689bee385b7..b1f59258b0eb8 100644
--- 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
index cb7b556486a0c..490179e91ddda 100644
--- 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 = ();
 }