diff --git a/integration-tests/src/exchange_asset.rs b/integration-tests/src/exchange_asset.rs index 3e25289f9e..762fa3aa44 100644 --- a/integration-tests/src/exchange_asset.rs +++ b/integration-tests/src/exchange_asset.rs @@ -1,14 +1,10 @@ #![cfg(test)] use crate::kusama_test_net::*; -use basilisk_runtime::Currencies; use basilisk_runtime::RuntimeOrigin; use basilisk_runtime::XYK; use frame_support::dispatch::GetDispatchInfo; use frame_support::{assert_ok, pallet_prelude::*}; -use hydradx_traits::router::AssetPair; -use hydradx_traits::router::PoolType; -use hydradx_traits::router::Trade; use orml_traits::currency::MultiCurrency; use polkadot_xcm::{ opaque::v3::{Junction, Junctions::X2, MultiLocation}, @@ -288,26 +284,3 @@ fn create_xyk_pool(asset_a: u32, asset_b: u32) { 50 * UNITS, )); } - -fn create_xyk_pool_with_amounts(asset_a: u32, amount_a: u128, asset_b: u32, amount_b: u128) { - assert_ok!(Currencies::update_balance( - RuntimeOrigin::root(), - DAVE.into(), - asset_a, - amount_a as i128, - )); - - assert_ok!(Currencies::update_balance( - RuntimeOrigin::root(), - DAVE.into(), - asset_b, - amount_b as i128, - )); - assert_ok!(XYK::create_pool( - RuntimeOrigin::signed(DAVE.into()), - asset_a, - amount_a, - asset_b, - amount_b, - )); -} diff --git a/integration-tests/src/kusama_test_net.rs b/integration-tests/src/kusama_test_net.rs index f1ca79dfaf..35111d42b0 100644 --- a/integration-tests/src/kusama_test_net.rs +++ b/integration-tests/src/kusama_test_net.rs @@ -63,7 +63,6 @@ use primitives::constants::chain::CORE_ASSET_ID; pub use xcm_emulator::Network; use xcm_emulator::{decl_test_networks, decl_test_parachains, decl_test_relay_chains}; -pub type Rococo = RococoRelayChain; pub type Basilisk = BasiliskParachain; pub type OtherParachain = OtherPara; @@ -483,18 +482,6 @@ pub fn expect_basilisk_events(e: Vec) { assert_eq!(last_basilisk_events(e.len()), e); } -pub fn expect_basilisk_event(e: basilisk_runtime::RuntimeEvent) { - let last_10_events = last_basilisk_events(10); - let mut found = false; - for event in last_10_events { - if event == e { - found = true; - break; - } - } - assert!(found, "Event not found in the last 10 basilisk events"); -} - #[allow(dead_code)] pub fn last_parachain_events(n: usize) -> Vec { frame_system::Pallet::::events() @@ -716,7 +703,7 @@ pub fn set_para_slot_info(number: u64) { // )); frame_support::storage::unhashed::put( &frame_support::storage::storage_prefix(b"AuraExt", b"SlotInfo"), - &((Slot::from(number), 0)), + &(Slot::from(number), 0), ); } diff --git a/pallets/asset-registry/src/mock.rs b/pallets/asset-registry/src/mock.rs index 72974e840f..6b914c501f 100644 --- a/pallets/asset-registry/src/mock.rs +++ b/pallets/asset-registry/src/mock.rs @@ -15,8 +15,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -#![cfg(test)] - use frame_support::parameter_types; use frame_system as system; use sp_core::H256; diff --git a/runtime/basilisk/src/governance/mod.rs b/runtime/basilisk/src/governance/mod.rs index 4ab8562145..5e3ecb8570 100644 --- a/runtime/basilisk/src/governance/mod.rs +++ b/runtime/basilisk/src/governance/mod.rs @@ -77,7 +77,7 @@ impl pallet_conviction_voting::Config for Runtime { } parameter_types! { - pub const MaxBalance: Balance = Balance::max_value(); + pub const MaxBalance: Balance = Balance::MAX; } pub type TreasurySpender = EitherOf, Spender>;