trying to compile it

centrifuge · Aug 13, 2024 · dd82fe9 · dd82fe9
1 parent 8304c1c
commit dd82fe9
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 18 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/pallets/liquidity-pools-gateway/src/lib.rs b/pallets/liquidity-pools-gateway/src/lib.rs
@@ -40,7 +40,7 @@ use message::GatewayMessage;
 use orml_traits::GetByKey;
 pub use pallet::*;
 use parity_scale_codec::FullCodec;
-use sp_std::convert::TryInto;
+use sp_std::{convert::TryInto, vec::Vec};
 
 use crate::weights::WeightInfo;
 

diff --git a/runtime/common/src/routing.rs b/runtime/common/src/routing.rs
@@ -10,7 +10,7 @@ use frame_support::{
 use pallet_axelar_router::AxelarId;
 use sp_core::{H160, H256};
 use sp_runtime::traits::{BlakeTwo256, Hash};
-use sp_std::marker::PhantomData;
+use sp_std::{marker::PhantomData, vec};
 
 /// Identification of the router where the message is sent and received
 /// RouterId is more specific than Domain, because RouterId also identify by

diff --git a/runtime/integration-tests/Cargo.toml b/runtime/integration-tests/Cargo.toml
@@ -14,7 +14,7 @@ ethabi = { workspace = true, features = ["std", "full-serde"] }
 ethereum = { workspace = true, features = ["std"] }
 fudge = { workspace = true }
 fudge-core = { workspace = true }
-hex = { workspace = true }
+hex = { workspace = true, features = ["std"] }
 hex-literal = { workspace = true }
 lazy_static = { workspace = true }
 parity-scale-codec = { workspace = true }
@@ -80,12 +80,10 @@ cfg-traits = { workspace = true, features = ["std"] }
 cfg-types = { workspace = true, features = ["std"] }
 cfg-utils = { workspace = true, features = ["std"] }
 development-runtime = { workspace = true, features = ["std"] }
-liquidity-pools-gateway-routers = { workspace = true, features = ["std"] }
 runtime-common = { workspace = true, features = ["std"] }
 runtime-integration-tests-proc-macro = { workspace = true }
 
 # Pallet list
-axelar-gateway-precompile = { workspace = true, features = ["std"] }
 chainbridge = { workspace = true, features = ["std"] }
 cumulus-pallet-aura-ext = { workspace = true, features = ["std"] }
 cumulus-pallet-parachain-system = { workspace = true, features = ["std"] }
@@ -98,6 +96,7 @@ orml-xtokens = { workspace = true, features = ["std"] }
 pallet-anchors = { workspace = true, features = ["std"] }
 pallet-aura = { workspace = true, features = ["std"] }
 pallet-authorship = { workspace = true, features = ["std"] }
+pallet-axelar-router = { workspace = true, features = ["std"] }
 pallet-balances = { workspace = true, features = ["std"] }
 pallet-base-fee = { workspace = true, features = ["std"] }
 pallet-block-rewards = { workspace = true, features = ["std"] }

diff --git a/runtime/integration-tests/src/cases.rs b/runtime/integration-tests/src/cases.rs
@@ -5,13 +5,13 @@ mod currency_conversions;
 mod ethereum_transaction;
 mod example;
 mod investments;
-mod liquidity_pools;
+//mod liquidity_pools;
 mod liquidity_pools_gateway_queue;
 mod loans;
-mod lp;
+//mod lp;
 mod oracles;
-mod precompile;
+//mod precompile;
 mod proxy;
-mod restricted_transfers;
-mod routers;
-mod xcm_transfers;
+//mod restricted_transfers;
+//mod routers;
+//mod xcm_transfers;
diff --git a/runtime/integration-tests/src/cases/liquidity_pools_gateway_queue.rs b/runtime/integration-tests/src/cases/liquidity_pools_gateway_queue.rs
@@ -57,7 +57,7 @@ fn outbound<T: Runtime + FudgeSupport>() {
 	let expected_event = env.parachain_state_mut(|| {
 		let nonce = <T as pallet_liquidity_pools_gateway_queue::Config>::MessageNonce::one();
 		let message = GatewayMessage::Outbound {
-			sender: [1; 32].into(),
+			sender: DomainAddress::Centrifuge([1; 32]),
 			destination: Domain::EVM(1),
 			message: Message::Invalid,
 		};

diff --git a/runtime/integration-tests/src/config.rs b/runtime/integration-tests/src/config.rs
@@ -20,7 +20,6 @@ use frame_support::{
 	traits::{IsSubType, IsType, OriginTrait},
 	Parameter,
 };
-use liquidity_pools_gateway_routers::DomainRouter;
 use pallet_liquidity_pools::Message;
 use pallet_liquidity_pools_gateway::message::GatewayMessage;
 use pallet_transaction_payment::CurrencyAdapter;
@@ -34,6 +33,7 @@ use runtime_common::{
 	oracle::Feeder,
 	remarks::Remark,
 	rewards::SingleCurrencyMovement,
+	routing::RouterId,
 };
 use sp_core::{sr25519::Public, H256};
 use sp_runtime::{
@@ -136,8 +136,8 @@ pub trait Runtime:
 		PoolId = PoolId,
 		TrancheId = TrancheId,
 		BalanceRatio = Ratio,
-	> + pallet_liquidity_pools_gateway::Config<Router = DomainRouter<Self>, Message = Message>
-	+ pallet_liquidity_pools_gateway_queue::Config<Message = GatewayMessage<AccountId, Message>>
+	> + pallet_liquidity_pools_gateway::Config<RouterId = RouterId, Message = Message>
+	+ pallet_liquidity_pools_gateway_queue::Config<Message = GatewayMessage<Message>>
 	+ pallet_xcm_transactor::Config<CurrencyId = CurrencyId>
 	+ pallet_ethereum::Config
 	+ pallet_ethereum_transaction::Config
@@ -183,7 +183,7 @@ pub trait Runtime:
 		CurrencyId = CurrencyId,
 		Balance = Balance,
 		Rewards = pallet_rewards::Pallet<Self, instances::BlockRewards>,
-	> + axelar_gateway_precompile::Config
+	> + pallet_axelar_router::Config
 	+ pallet_token_mux::Config<
 		BalanceIn = Balance,
 		BalanceOut = Balance,