integration-tests: Re-structure connectors tests

centrifuge · Aug 8, 2023 · 1312f1a · 1312f1a
1 parent 548f7a1
commit 1312f1a
Show file tree

Hide file tree

Showing 32 changed files with 25 additions and 316 deletions.
diff --git a/...n-tests/src/connectors_gateway/gateway.rs → ...tegration-tests/src/connectors/gateway.rs b/...n-tests/src/connectors_gateway/gateway.rs → ...tegration-tests/src/connectors/gateway.rs
diff --git a/...ation-tests/src/connectors_gateway/mod.rs → ...e/integration-tests/src/connectors/mod.rs b/...ation-tests/src/connectors_gateway/mod.rs → ...e/integration-tests/src/connectors/mod.rs
@@ -11,4 +11,4 @@
 // GNU General Public License for more details.
 
 mod gateway;
-mod routers;
+mod pallet;
diff --git a/...egration-tests/src/xcm/development/mod.rs → .../src/connectors/pallet/development/mod.rs b/...egration-tests/src/xcm/development/mod.rs → .../src/connectors/pallet/development/mod.rs
diff --git a/...ration-tests/src/xcm/development/setup.rs → ...rc/connectors/pallet/development/setup.rs b/...ration-tests/src/xcm/development/setup.rs → ...rc/connectors/pallet/development/setup.rs
@@ -12,13 +12,16 @@
 
 pub use altair_runtime::{AccountId, CurrencyId, Runtime, RuntimeOrigin, System};
 use cfg_primitives::{currency_decimals, parachains, Balance};
-use cfg_types::tokens::CustomMetadata;
+use cfg_types::{domain_address::Domain, tokens::CustomMetadata};
 use frame_support::traits::GenesisBuild;
 use orml_traits::asset_registry::AssetMetadata;
 
 /// Accounts
 pub const ALICE: [u8; 32] = [4u8; 32];
 pub const BOB: [u8; 32] = [5u8; 32];
+pub const CHARLIE: [u8; 32] = [6u8; 32];
+
+pub const TEST_DOMAIN: Domain = Domain::EVM(1284);
 
 /// A PARA ID used for a sibling parachain emulating Moonbeam.
 /// It must be one that doesn't collide with any other in use.

diff --git a/...ion-tests/src/xcm/development/test_net.rs → ...connectors/pallet/development/test_net.rs b/...ion-tests/src/xcm/development/test_net.rs → ...connectors/pallet/development/test_net.rs
diff --git a/...s/src/xcm/development/tests/connectors.rs → ...rs/pallet/development/tests/connectors.rs b/...s/src/xcm/development/tests/connectors.rs → ...rs/pallet/development/tests/connectors.rs
@@ -80,14 +80,14 @@ use utils::investments::{
 use xcm_emulator::TestExt;
 
 use crate::{
-	utils::{AUSD_CURRENCY_ID, GLIMMER_CURRENCY_ID, MOONBEAM_EVM_CHAIN_ID},
-	xcm::development::{
+	connectors::pallet::development::{
 		setup::{cfg, dollar, ALICE, BOB, PARA_ID_MOONBEAM},
 		test_net::{Development, Moonbeam, RelayChain, TestNet},
 		tests::connectors::utils::{
 			get_default_moonbeam_native_token_location, DEFAULT_MOONBEAM_LOCATION,
 		},
 	},
+	utils::{AUSD_CURRENCY_ID, GLIMMER_CURRENCY_ID, MOONBEAM_EVM_CHAIN_ID},
 	*,
 };
 
@@ -1644,8 +1644,8 @@ mod utils {
 
 	use super::*;
 	use crate::{
+		connectors::pallet::development::tests::register_ausd,
 		utils::{AUSD_CURRENCY_ID, GLIMMER_CURRENCY_ID, MOONBEAM_EVM_CHAIN_ID},
-		xcm::development::tests::register_ausd,
 	};
 
 	pub const DEFAULT_BALANCE_GLMR: Balance = 10_000_000_000_000_000_000;

diff --git a/...on-tests/src/xcm/development/tests/mod.rs → ...onnectors/pallet/development/tests/mod.rs b/...on-tests/src/xcm/development/tests/mod.rs → ...onnectors/pallet/development/tests/mod.rs
@@ -13,6 +13,7 @@ use xcm::{
 use crate::utils::AUSD_CURRENCY_ID;
 
 mod connectors;
+mod routers;
 
 /// Register AUSD in the asset registry.
 /// It should be executed within an externalities environment.

diff --git a/...tors_gateway/routers/axelar_evm/router.rs → ...t/development/tests/routers/axelar_evm.rs b/...tors_gateway/routers/axelar_evm/router.rs → ...t/development/tests/routers/axelar_evm.rs
diff --git a/...rs_gateway/routers/ethereum_xcm/router.rs → ...development/tests/routers/ethereum_xcm.rs b/...rs_gateway/routers/ethereum_xcm/router.rs → ...development/tests/routers/ethereum_xcm.rs
@@ -38,7 +38,7 @@ use crate::{
 	chain::centrifuge::{
 		Balance, ConnectorsGateway, OrmlAssetRegistry, OrmlTokens, Runtime, RuntimeOrigin,
 	},
-	connectors_gateway::routers::ethereum_xcm::{
+	connectors::pallet::development::{
 		setup::{dollar, ALICE, BOB, CHARLIE, PARA_ID_MOONBEAM, TEST_DOMAIN},
 		test_net::{Development, Moonbeam, RelayChain, TestNet},
 	},

diff --git a/...sts/src/connectors_gateway/routers/mod.rs → ...s/pallet/development/tests/routers/mod.rs b/...sts/src/connectors_gateway/routers/mod.rs → ...s/pallet/development/tests/routers/mod.rs
diff --git a/...e/integration-tests/src/xcm/kusama/mod.rs → ...tests/src/connectors/pallet/kusama/mod.rs b/...e/integration-tests/src/xcm/kusama/mod.rs → ...tests/src/connectors/pallet/kusama/mod.rs
diff --git a/...-tests/src/xcm/kusama/restricted_calls.rs → ...nectors/pallet/kusama/restricted_calls.rs b/...-tests/src/xcm/kusama/restricted_calls.rs → ...nectors/pallet/kusama/restricted_calls.rs
@@ -41,7 +41,7 @@ use xcm::{
 };
 use xcm_emulator::TestExt;
 
-use crate::xcm::kusama::{
+use crate::connectors::pallet::kusama::{
 	setup::{air, foreign, sibling_account, ALICE, BOB, PARA_ID_SIBLING},
 	test_net::{Altair, KusamaNet, Sibling, TestNet},
 };

diff --git a/...integration-tests/src/xcm/kusama/setup.rs → ...sts/src/connectors/pallet/kusama/setup.rs b/...integration-tests/src/xcm/kusama/setup.rs → ...sts/src/connectors/pallet/kusama/setup.rs
diff --git a/...egration-tests/src/xcm/kusama/test_net.rs → .../src/connectors/pallet/kusama/test_net.rs b/...egration-tests/src/xcm/kusama/test_net.rs → .../src/connectors/pallet/kusama/test_net.rs
diff --git a/...ts/src/xcm/kusama/tests/asset_registry.rs → ...ors/pallet/kusama/tests/asset_registry.rs b/...ts/src/xcm/kusama/tests/asset_registry.rs → ...ors/pallet/kusama/tests/asset_registry.rs
@@ -42,7 +42,7 @@ use xcm::{
 };
 use xcm_emulator::TestExt;
 
-use crate::xcm::kusama::{
+use crate::connectors::pallet::kusama::{
 	setup::{
 		air, altair_account, ausd, foreign, karura_account, ksm, sibling_account, ALICE, BOB,
 		PARA_ID_SIBLING,

diff --git a/...c/xcm/kusama/tests/currency_id_convert.rs → ...allet/kusama/tests/currency_id_convert.rs b/...c/xcm/kusama/tests/currency_id_convert.rs → ...allet/kusama/tests/currency_id_convert.rs
@@ -51,15 +51,15 @@ use xcm_emulator::TestExt;
 use xcm_executor::traits::Convert as C1;
 
 use crate::{
-	utils::AUSD_CURRENCY_ID,
-	xcm::kusama::{
+	connectors::pallet::kusama::{
 		setup::{
 			air, altair_account, ausd, foreign, karura_account, ksm, sibling_account, ALICE, BOB,
 			KSM_ASSET_ID, PARA_ID_SIBLING,
 		},
 		test_net::{Altair, Karura, KusamaNet, Sibling, TestNet},
 		tests::{register_air, register_ausd, register_ksm},
 	},
+	utils::AUSD_CURRENCY_ID,
 };
 
 #[test]

diff --git a/...gration-tests/src/xcm/kusama/tests/mod.rs → ...src/connectors/pallet/kusama/tests/mod.rs b/...gration-tests/src/xcm/kusama/tests/mod.rs → ...src/connectors/pallet/kusama/tests/mod.rs
@@ -13,7 +13,7 @@ use xcm::{
 	VersionedMultiLocation,
 };
 
-use crate::{utils::AUSD_CURRENCY_ID, xcm::kusama::setup::KSM_ASSET_ID};
+use crate::{connectors::pallet::kusama::setup::KSM_ASSET_ID, utils::AUSD_CURRENCY_ID};
 
 mod asset_registry;
 mod currency_id_convert;

diff --git a/...n-tests/src/xcm/kusama/tests/transfers.rs → ...nnectors/pallet/kusama/tests/transfers.rs b/...n-tests/src/xcm/kusama/tests/transfers.rs → ...nnectors/pallet/kusama/tests/transfers.rs
@@ -42,8 +42,7 @@ use xcm::{
 use xcm_emulator::TestExt;
 
 use crate::{
-	utils::AUSD_CURRENCY_ID,
-	xcm::{
+	connectors::pallet::{
 		kusama::{
 			setup::{
 				air, altair_account, ausd, foreign, karura_account, ksm, sibling_account, ALICE,
@@ -54,6 +53,7 @@ use crate::{
 		},
 		xcm_metadata,
 	},
+	utils::AUSD_CURRENCY_ID,
 };
 
 /*

diff --git a/runtime/integration-tests/src/xcm/mod.rs → ...ration-tests/src/connectors/pallet/mod.rs b/runtime/integration-tests/src/xcm/mod.rs → ...ration-tests/src/connectors/pallet/mod.rs
diff --git a/...integration-tests/src/xcm/polkadot/mod.rs → ...sts/src/connectors/pallet/polkadot/mod.rs b/...integration-tests/src/xcm/polkadot/mod.rs → ...sts/src/connectors/pallet/polkadot/mod.rs
diff --git a/...tegration-tests/src/xcm/polkadot/setup.rs → ...s/src/connectors/pallet/polkadot/setup.rs b/...tegration-tests/src/xcm/polkadot/setup.rs → ...s/src/connectors/pallet/polkadot/setup.rs
diff --git a/...ration-tests/src/xcm/polkadot/test_net.rs → ...rc/connectors/pallet/polkadot/test_net.rs b/...ration-tests/src/xcm/polkadot/test_net.rs → ...rc/connectors/pallet/polkadot/test_net.rs
diff --git a/.../src/xcm/polkadot/tests/asset_registry.rs → ...s/pallet/polkadot/tests/asset_registry.rs b/.../src/xcm/polkadot/tests/asset_registry.rs → ...s/pallet/polkadot/tests/asset_registry.rs
@@ -40,7 +40,7 @@ use xcm::{
 };
 use xcm_emulator::TestExt;
 
-use crate::xcm::polkadot::{
+use crate::connectors::pallet::polkadot::{
 	setup::{
 		acala_account, ausd, centrifuge_account, cfg, dot, foreign, sibling_account, ALICE, BOB,
 		DOT_ASSET_ID, PARA_ID_SIBLING,

diff --git a/...xcm/polkadot/tests/currency_id_convert.rs → ...let/polkadot/tests/currency_id_convert.rs b/...xcm/polkadot/tests/currency_id_convert.rs → ...let/polkadot/tests/currency_id_convert.rs
@@ -51,15 +51,15 @@ use xcm_executor::traits::Convert as C1;
 
 use super::register_dot;
 use crate::{
-	utils::AUSD_CURRENCY_ID,
-	xcm::polkadot::{
+	connectors::pallet::polkadot::{
 		setup::{
 			acala_account, ausd, centrifuge_account, cfg, dot, foreign, sibling_account, ALICE,
 			BOB, DOT_ASSET_ID, NO_XCM_ASSET_ID, PARA_ID_SIBLING,
 		},
 		test_net::{Acala, Centrifuge, PolkadotNet, Sibling, TestNet},
 		tests::{register_ausd, register_cfg, register_cfg_v2, register_no_xcm_token},
 	},
+	utils::AUSD_CURRENCY_ID,
 };
 
 #[test]

diff --git a/...ation-tests/src/xcm/polkadot/tests/mod.rs → ...c/connectors/pallet/polkadot/tests/mod.rs b/...ation-tests/src/xcm/polkadot/tests/mod.rs → ...c/connectors/pallet/polkadot/tests/mod.rs
@@ -27,8 +27,8 @@ use xcm::{
 };
 
 use crate::{
+	connectors::pallet::polkadot::setup::{DOT_ASSET_ID, NO_XCM_ASSET_ID},
 	utils::AUSD_CURRENCY_ID,
-	xcm::polkadot::setup::{DOT_ASSET_ID, NO_XCM_ASSET_ID},
 };
 
 mod asset_registry;

diff --git a/...rc/xcm/polkadot/tests/restricted_calls.rs → ...pallet/polkadot/tests/restricted_calls.rs b/...rc/xcm/polkadot/tests/restricted_calls.rs → ...pallet/polkadot/tests/restricted_calls.rs
@@ -44,7 +44,7 @@ use xcm::{
 };
 use xcm_emulator::TestExt;
 
-use crate::xcm::polkadot::{
+use crate::connectors::pallet::polkadot::{
 	setup::{
 		acala_account, ausd, centrifuge_account, cfg, dot, foreign, sibling_account, ALICE, BOB,
 		DOT_ASSET_ID, PARA_ID_SIBLING,

diff --git a/...tests/src/xcm/polkadot/tests/transfers.rs → ...ectors/pallet/polkadot/tests/transfers.rs b/...tests/src/xcm/polkadot/tests/transfers.rs → ...ectors/pallet/polkadot/tests/transfers.rs
@@ -43,8 +43,7 @@ use xcm_emulator::TestExt;
 
 use super::register_dot;
 use crate::{
-	utils::AUSD_CURRENCY_ID,
-	xcm::{
+	connectors::pallet::{
 		polkadot::{
 			setup::{
 				acala_account, ausd, centrifuge_account, cfg, dot, foreign, sibling_account, ALICE,
@@ -55,6 +54,7 @@ use crate::{
 		},
 		xcm_metadata,
 	},
+	utils::AUSD_CURRENCY_ID,
 };
 
 /*

diff --git a/runtime/integration-tests/src/connectors_gateway/routers/axelar_evm/mod.rs b/runtime/integration-tests/src/connectors_gateway/routers/axelar_evm/mod.rs
diff --git a/runtime/integration-tests/src/connectors_gateway/routers/ethereum_xcm/mod.rs b/runtime/integration-tests/src/connectors_gateway/routers/ethereum_xcm/mod.rs
diff --git a/runtime/integration-tests/src/connectors_gateway/routers/ethereum_xcm/setup.rs b/runtime/integration-tests/src/connectors_gateway/routers/ethereum_xcm/setup.rs