Skip to content

Commit

Permalink
fix build after merge
Browse files Browse the repository at this point in the history
  • Loading branch information
martin-chainflip committed Sep 27, 2023
1 parent a0a0ff6 commit f02d229
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion state-chain/node/src/chain_spec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
8 changes: 5 additions & 3 deletions state-chain/node/src/chain_spec/kitkat.rs
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
4 changes: 1 addition & 3 deletions state-chain/pallets/cf-lp/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::*;

Expand Down

0 comments on commit f02d229

Please sign in to comment.