Skip to content

Commit f29ba0f

Browse files
NachoPalNachoPal
committed
improve hygiene & clean up - tests
1 parent b13e4e8 commit f29ba0f

File tree

7 files changed

+33
-82
lines changed

7 files changed

+33
-82
lines changed

‎Cargo.lock

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎cumulus/parachains/integration-tests/emulated/assets/asset-hub-kusama/src/lib.rs

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,39 +18,29 @@ pub use codec::Encode;
1818
pub use frame_support::{
1919
assert_err, assert_ok,
2020
pallet_prelude::Weight,
21-
sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
22-
traits::{fungibles::Inspect, OriginTrait},
21+
sp_runtime::{AccountId32, DispatchError, DispatchResult},
22+
traits::fungibles::Inspect,
2323
};
2424
pub use integration_tests_common::{
2525
constants::{
26-
accounts::{ALICE, BOB},
2726
asset_hub_kusama::ED as ASSET_HUB_KUSAMA_ED,
2827
kusama::ED as KUSAMA_ED,
2928
PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
3029
},
3130
xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution}, AssetHubKusama,
32-
AssetHubKusamaPallet, AssetHubKusamaReceiver, AssetHubKusamaSender, BridgeHubKusama,
33-
BridgeHubKusamaPallet, BridgeHubKusamaReceiver, BridgeHubKusamaSender, BridgeHubPolkadot,
34-
BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, Collectives,
35-
CollectivesPallet, CollectivesReceiver, CollectivesSender, Kusama, KusamaMockNet, KusamaPallet,
36-
KusamaReceiver, KusamaSender, PenpalKusamaA, PenpalKusamaAPallet, PenpalKusamaAReceiver,
37-
PenpalKusamaASender, PenpalKusamaB, PenpalKusamaBPallet, PenpalKusamaBReceiver,
38-
PenpalKusamaBSender, PenpalPolkadotA, PenpalPolkadotAReceiver, PenpalPolkadotASender, Polkadot,
39-
PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
31+
Kusama, PenpalKusamaA, AssetHubKusamaReceiver, KusamaPallet, AssetHubKusamaPallet,
32+
AssetHubKusamaSender, PenpalKusamaAReceiver, KusamaReceiver, KusamaSender,
33+
PenpalKusamaAPallet, PenpalKusamaASender
4034
};
4135
pub use parachains_common::{AccountId, Balance};
42-
pub use polkadot_core_primitives::InboundDownwardMessage;
43-
pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
44-
pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
4536
pub use xcm::{
4637
prelude::{*, AccountId32 as AccountId32Junction},
4738
v3::{Error, NetworkId::Kusama as KusamaId},
48-
DoubleEncoded,
4939
};
5040
pub use xcm_emulator::{
5141
assert_expected_events, bx, helpers::weight_within_threshold,
52-
Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
53-
TestContext, TestExt, TestExternalities,
42+
Chain, Parachain as Para, RelayChain as Relay, Test, TestArgs,
43+
TestContext, TestExt
5444
};
5545

5646
pub const ASSET_ID: u32 = 1;

‎cumulus/parachains/integration-tests/emulated/assets/asset-hub-polkadot/src/lib.rs

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,29 @@ pub use codec::Encode;
1818
pub use frame_support::{
1919
assert_err, assert_ok,
2020
pallet_prelude::Weight,
21-
sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
22-
traits::{fungibles::Inspect, OriginTrait},
21+
sp_runtime::{AccountId32, DispatchError, DispatchResult},
22+
traits::fungibles::Inspect,
2323
};
2424
pub use integration_tests_common::{
2525
constants::{
26-
accounts::{ALICE, BOB},
2726
asset_hub_polkadot::ED as ASSET_HUB_POLKADOT_ED,
2827
polkadot::ED as POLKADOT_ED,
2928
PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
3029
},
3130
xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
32-
AssetHubPolkadot, AssetHubPolkadotPallet, AssetHubPolkadotReceiver, AssetHubPolkadotSender, BridgeHubPolkadot,
33-
BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, Collectives,
34-
CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalPolkadotA,
35-
PenpalPolkadotAPallet, PenpalPolkadotAReceiver, PenpalPolkadotASender, PenpalPolkadotB,
36-
PenpalPolkadotBPallet, PenpalPolkadotBReceiver, PenpalPolkadotBSender, Polkadot,
37-
PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
31+
AssetHubPolkadot, Polkadot, PolkadotPallet, PenpalPolkadotA, AssetHubPolkadotPallet,
32+
AssetHubPolkadotReceiver, PolkadotSender, PolkadotReceiver, AssetHubPolkadotSender,
33+
PenpalPolkadotAReceiver
3834
};
3935
pub use parachains_common::{AccountId, Balance};
40-
pub use polkadot_core_primitives::InboundDownwardMessage;
41-
pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
42-
pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
4336
pub use xcm::{
4437
prelude::{*, AccountId32 as AccountId32Junction},
4538
v3::{Error, NetworkId::Polkadot as PolkadotId},
46-
DoubleEncoded,
4739
};
4840
pub use xcm_emulator::{
4941
assert_expected_events, bx, helpers::weight_within_threshold,
50-
Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
51-
TestContext, TestExt, TestExternalities,
42+
Chain, Parachain as Para, RelayChain as Relay, Test, TestArgs,
43+
TestContext, TestExt
5244
};
5345

5446
pub const ASSET_ID: u32 = 1;

‎cumulus/parachains/integration-tests/emulated/assets/asset-hub-westend/src/lib.rs

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,36 +19,31 @@ pub use frame_support::{
1919
assert_err, assert_ok,
2020
instances::Instance2,
2121
pallet_prelude::Weight,
22-
sp_runtime::{AccountId32, DispatchError, DispatchResult, ModuleError, MultiAddress},
23-
traits::{fungibles::Inspect, OriginTrait},
22+
sp_runtime::{AccountId32, DispatchError, DispatchResult, ModuleError},
23+
traits::fungibles::Inspect,
2424
BoundedVec,
2525
};
2626
pub use integration_tests_common::{
2727
constants::{
28-
accounts::{ALICE, BOB},
2928
asset_hub_westend::ED as ASSET_HUB_WESTEND_ED,
3029
westend::ED as WESTEND_ED,
3130
PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
3231
},
3332
xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
34-
AssetHubWestend, AssetHubWestendPallet, AssetHubWestendReceiver, AssetHubWestendSender, Collectives,
35-
CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalWestendA,
36-
PenpalWestendAPallet, PenpalWestendAReceiver, PenpalWestendASender, Westend, WestendMockNet,
37-
WestendPallet, WestendReceiver, WestendSender,
33+
AssetHubWestend, Westend, PenpalWestendA, AssetHubWestendReceiver,
34+
AssetHubWestendPallet, WestendPallet, WestendSender, WestendReceiver,
35+
AssetHubWestendSender, PenpalWestendAReceiver, PenpalWestendASender,
36+
PenpalWestendAPallet,
3837
};
3938
pub use parachains_common::{AccountId, Balance};
40-
pub use polkadot_core_primitives::InboundDownwardMessage;
41-
pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
42-
pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
4339
pub use xcm::{
4440
prelude::{*, AccountId32 as AccountId32Junction},
4541
v3::{Error, NetworkId::Westend as WestendId},
46-
DoubleEncoded,
4742
};
4843
pub use xcm_emulator::{
4944
assert_expected_events, bx, helpers::weight_within_threshold,
50-
Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
51-
TestContext, TestExt, TestExternalities,
45+
Chain, Parachain as Para, RelayChain as Relay, Test, TestArgs,
46+
TestContext, TestExt
5247
};
5348

5449
pub const ASSET_ID: u32 = 1;

‎cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ pallet-xcm = { path = "../../../../../../polkadot/xcm/pallet-xcm", default-featu
2929
# Cumulus
3030
parachains-common = { path = "../../../../common" }
3131
cumulus-pallet-xcmp-queue = { path = "../../../../../pallets/xcmp-queue", default-features = false}
32+
cumulus-pallet-dmp-queue = { path = "../../../../../pallets/dmp-queue", default-features = false}
3233
cumulus-pallet-parachain-system = { path = "../../../../../pallets/parachain-system" }
3334
pallet-bridge-messages = { path = "../../../../../bridges/modules/messages", default-features = false}
3435
bp-messages = { path = "../../../../../bridges/primitives/messages", default-features = false}

‎cumulus/parachains/integration-tests/emulated/bridges/bridge-hub-rococo/src/lib.rs

Lines changed: 5 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -15,46 +15,29 @@
1515
// along with Cumulus. If not, see <http://www.gnu.org/licenses/>.
1616

1717
pub use bp_messages::LaneId;
18-
pub use codec::Encode;
19-
pub use frame_support::{
20-
assert_err, assert_ok,
21-
pallet_prelude::Weight,
22-
sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
23-
traits::{fungibles::Inspect, OriginTrait},
24-
};
18+
pub use frame_support::assert_ok;
2519
pub use integration_tests_common::{
2620
constants::{
27-
accounts::{ALICE, BOB},
2821
asset_hub_kusama::ED as ASSET_HUB_ROCOCO_ED,
2922
kusama::ED as ROCOCO_ED,
3023
PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
3124
},
3225
xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
33-
AssetHubRococo, AssetHubRococoPallet, AssetHubRococoReceiver, AssetHubRococoSender, AssetHubWococo,
34-
AssetHubWococoPallet, AssetHubWococoReceiver, AssetHubWococoSender, BridgeHubRococo,
35-
BridgeHubRococoPallet, BridgeHubRococoReceiver, BridgeHubRococoSender, BridgeHubWococo,
36-
BridgeHubWococoPallet, BridgeHubWococoReceiver, BridgeHubWococoSender, Collectives,
37-
CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalRococoA, PenpalRococoAPallet,
38-
PenpalRococoAReceiver, PenpalRococoASender, Rococo, RococoMockNet, RococoPallet,
39-
RococoReceiver, RococoSender, Wococo, WococoMockNet, WococoPallet, WococoReceiver,
40-
WococoSender,
26+
Rococo, BridgeHubRococo, AssetHubWococo, RococoPallet, BridgeHubWococo,
27+
AssetHubRococo, PenpalRococoA, AssetHubRococoReceiver,
4128
};
4229
pub use parachains_common::{AccountId, Balance};
43-
pub use polkadot_core_primitives::InboundDownwardMessage;
44-
pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
45-
pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
4630
pub use xcm::{
4731
prelude::{*, AccountId32 as AccountId32Junction},
4832
v3::{
4933
Error,
5034
NetworkId::{Rococo as RococoId, Wococo as WococoId},
5135
},
52-
DoubleEncoded,
5336
};
5437
pub use xcm_emulator::{
5538
assert_expected_events, bx, helpers::weight_within_threshold,
56-
Chain, ParaId, Parachain as Para, RelayChain as Relay, Test, TestArgs,
57-
TestContext, TestExt, TestExternalities,
39+
Chain, Parachain as Para, RelayChain as Relay, Test, TestArgs,
40+
TestContext, TestExt
5841
};
5942

6043
pub const ASSET_ID: u32 = 1;

‎cumulus/parachains/integration-tests/emulated/collectives/collectives-polkadot/src/lib.rs

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,34 +16,23 @@
1616

1717
pub use codec::Encode;
1818
pub use frame_support::{
19-
assert_err, assert_ok,
20-
pallet_prelude::Weight,
21-
sp_runtime::{AccountId32, DispatchError, DispatchResult, MultiAddress},
22-
traits::{fungibles::Inspect, OriginTrait},
19+
assert_ok, sp_runtime::AccountId32,
2320
};
2421
pub use integration_tests_common::{
2522
constants::{
26-
accounts::{ALICE, BOB},
23+
accounts::ALICE,
2724
asset_hub_polkadot::ED as ASSET_HUB_POLKADOT_ED,
2825
polkadot::ED as POLKADOT_ED,
2926
PROOF_SIZE_THRESHOLD, REF_TIME_THRESHOLD, XCM_V3,
3027
},
3128
xcm_helpers::{xcm_transact_paid_execution, xcm_transact_unpaid_execution},
32-
AssetHubPolkadot, AssetHubPolkadotPallet, AssetHubPolkadotReceiver, AssetHubPolkadotSender, BridgeHubPolkadot,
33-
BridgeHubPolkadotPallet, BridgeHubPolkadotReceiver, BridgeHubPolkadotSender, Collectives,
34-
CollectivesPallet, CollectivesReceiver, CollectivesSender, PenpalPolkadotA,
35-
PenpalPolkadotAPallet, PenpalPolkadotAReceiver, PenpalPolkadotASender, PenpalPolkadotB,
36-
PenpalPolkadotBPallet, PenpalPolkadotBReceiver, PenpalPolkadotBSender, Polkadot,
37-
PolkadotMockNet, PolkadotPallet, PolkadotReceiver, PolkadotSender,
29+
AssetHubPolkadot, Polkadot, AssetHubPolkadotReceiver, PenpalPolkadotA,
30+
AssetHubPolkadotPallet, Collectives,
3831
};
3932
pub use parachains_common::{AccountId, Balance};
40-
pub use polkadot_core_primitives::InboundDownwardMessage;
41-
pub use polkadot_parachain::primitives::{HrmpChannelId, Id};
42-
pub use polkadot_runtime_parachains::inclusion::{AggregateMessageOrigin, UmpQueueId};
4333
pub use xcm::{
4434
prelude::{*, AccountId32 as AccountId32Junction},
4535
v3::{Error, NetworkId::Polkadot as PolkadotId},
46-
DoubleEncoded,
4736
};
4837
pub use xcm_emulator::{
4938
assert_expected_events, bx, helpers::weight_within_threshold,

0 commit comments

Comments
 (0)