From f02d2298fe633f708a80bc3e2f104cf5ef639d3d Mon Sep 17 00:00:00 2001
From: Martin Rieke <martin@chainflip.io>
Date: Wed, 27 Sep 2023 17:40:32 +0200
Subject: [PATCH] fix build after merge

---
 state-chain/node/src/chain_spec.rs        | 2 +-
 state-chain/node/src/chain_spec/kitkat.rs | 8 +++++---
 state-chain/pallets/cf-lp/src/lib.rs      | 4 +---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/state-chain/node/src/chain_spec.rs b/state-chain/node/src/chain_spec.rs
index 45b9eee3b4..a68e4faa94 100644
--- a/state-chain/node/src/chain_spec.rs
+++ b/state-chain/node/src/chain_spec.rs
@@ -46,8 +46,8 @@ use sp_runtime::{
 };
 
 pub mod common;
-pub mod kitkat;
 pub mod devnet;
+pub mod kitkat;
 pub mod partnernet;
 pub mod perseverance;
 pub mod sisyphos;
diff --git a/state-chain/node/src/chain_spec/kitkat.rs b/state-chain/node/src/chain_spec/kitkat.rs
index 493672a65d..bc03c3dccb 100644
--- a/state-chain/node/src/chain_spec/kitkat.rs
+++ b/state-chain/node/src/chain_spec/kitkat.rs
@@ -1,10 +1,12 @@
-pub use super::common::*;
+pub use super::{
+	common::*,
+	testnet::{BITCOIN_EXPIRY_BLOCKS, ETHEREUM_EXPIRY_BLOCKS, POLKADOT_EXPIRY_BLOCKS},
+};
 use super::{parse_account, StateChainEnvironment};
-use cf_chains::{dot::RuntimeVersion, eth::CHAIN_ID_GOERLI};
+use cf_chains::{dot::RuntimeVersion, eth::CHAIN_ID_MAINNET};
 use cf_primitives::{AccountId, AccountRole, BlockNumber, FlipBalance, NetworkEnvironment};
 use sc_service::ChainType;
 use sp_core::H256;
-use cf_chains::eth::CHAIN_ID_MAINNET;
 
 // *** Overrides from common
 pub const ACCRUAL_RATIO: (i32, u32) = (10, 10);
diff --git a/state-chain/pallets/cf-lp/src/lib.rs b/state-chain/pallets/cf-lp/src/lib.rs
index c95ae66a4c..399c26607a 100644
--- a/state-chain/pallets/cf-lp/src/lib.rs
+++ b/state-chain/pallets/cf-lp/src/lib.rs
@@ -7,9 +7,7 @@ use cf_traits::{
 	impl_pallet_safe_mode, liquidity::LpBalanceApi, AccountRoleRegistry, Chainflip, DepositApi,
 	EgressApi,
 };
-use frame_support::{
-	dispatch::Vec, pallet_prelude::*, sp_runtime::DispatchResult, traits::OnRuntimeUpgrade,
-};
+use frame_support::{pallet_prelude::*, sp_runtime::DispatchResult, traits::OnRuntimeUpgrade};
 use frame_system::pallet_prelude::*;
 pub use pallet::*;