Replicate `e2e` integration test as `emulated` #2958

NachoPal · 2023-08-01T12:03:05Z

Along with integration the tests for AssetHub, this PR includes improvements in xcm-emulator:

assert_expected_events!
- Prevents from false negatives and looks for a perfect match in case there are two events with the same pattern
- Prevents from matching with the same event as now they are removed from potential matches after a match
- Event logs are moved outside the macro, so now they are always logged inside execute_with()
move_ext_in and move_ext_out methods added to TextExt to allow sharing externalities states between tests.
Refactor of Relay and Parachain traits
- Common functionality has been moved to a common Chain trait.
- Runtime, RuntimeEvent, RuntimeCall, RuntimeOrigin have been removed from decl_test_relay_chains! and decl_test_parachains!. The rationale behind this is that they are generated by construct_runtime! and we can consider it as a standard. To get a reference to them, a new runtime attribute has been added. This attribute is expecting the path to the runtime crate, and the former runtime attribute has been renamed to core. It expresses the mandatory building blocks xcm-emulator needs to work (for this reason we removed Balances from core).
- Other items such as System have been removed, and kept/added only those ones that can be bounded by a trait.
Removal of the unnecessary RELAY_BLOCK_NUMBER thread variable, keeping relay block number accountability as part of the Relay Chain Externality
A Test struct and its impl that helps with re-usability avoiding repeating yourself.
And more refactor...

New helper parachains events methods have been added to each integration-tests crate + relay chain events in the common crate.

Finally, other helper methods such as xcm_paid_execution, xcm_unpaid_execution and force_create_and_mint_asset have been added too.

xcm/xcm-emulator/src/lib.rs

parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml

xcm/xcm-emulator/src/lib.rs

bkontur · 2023-08-03T16:00:06Z

@NachoPal I did some small nits here #2971 please check, continue tomorrow

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

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

xcm/xcm-emulator/src/lib.rs

parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs

gilescope

Loving it, lot's of good ideas in here.

…also for BridgeHubs) (#2971) * Extracted some commonality for Kusama/Polkadot (which will be reused also for BridgeHubs) * AssetHubRococo should better use AssetHubKusama runtime * add fund_account --------- Co-authored-by: NachoPal <ignacio.palacios.santos@gmail.com>

bkontur · 2023-08-04T14:33:25Z

parachains/integration-tests/emulated/common/src/lib.rs

+		type RuntimeEvent = <Polkadot as Chain>::RuntimeEvent;
+
+		// Dispatchable is completely executed and XCM sent
+		pub fn xcm_pallet_attempted_complete(expected_weight: Option<Weight>) {


@NachoPal
I would not use two levels of modules here,
why not just move this functions to revelant runtime, e.g.:

impl Kusama { pub fn xcm_pallet_attempted_complete(expected_weight: Option<Weight>) {... } impl Polkadot { pub fn xcm_pallet_attempted_complete(expected_weight: Option<Weight>) {... } ...

then usage will be much nicer:

// instead of: events::polkadot::xcm_pallet_attempted_complete // use just: Polkadot::xcm_pallet_attempted_complete

later when we split this common per runtime, it will be easier to refactor,

other thing is that I think those function looks the same,
and they could be write in generic way for trait Chain with some argument to specific Pallet if needed

Now that we can have chains impl, yes, I can move it to the impls.

About moving to Chain... xcm-emulator will not compile for someone who is using a chain without one of the expected RuntimeEvents variants. I do not think it is a good idea or necessary. It would fail for those chains that use xTokens pallet instead of XcmPallet, for example.

I didn't want to, but I ended up using macros. It was too much repetition.

yes, I got it that xcm-emulator is general, but there is also possiblity to create CumulusChain / PolkadotLikeTelayChain in emulated/common and so on

NachoPal · 2023-08-07T08:50:19Z

bot fmt

command-bot · 2023-08-07T08:50:24Z

@NachoPal https://gitlab.parity.io/parity/mirrors/cumulus/-/jobs/3338725 was started for your command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh". Check out https://gitlab.parity.io/parity/mirrors/cumulus/-/pipelines?page=1&scope=all&username=group_605_bot to know what else is being executed currently.

Comment bot cancel 15-6a422efa-db7f-4236-83a9-bcf9ee469cfd to cancel this command or bot cancel to cancel all commands in this pull request.

command-bot · 2023-08-07T08:51:53Z

@NachoPal Command "$PIPELINE_SCRIPTS_DIR/commands/fmt/fmt.sh" has finished. Result: https://gitlab.parity.io/parity/mirrors/cumulus/-/jobs/3338725 has finished. If any artifacts were generated, you can download them from https://gitlab.parity.io/parity/mirrors/cumulus/-/jobs/3338725/artifacts/download.

NachoPal · 2023-08-07T10:17:01Z

All comments addressed

xcm/xcm-emulator/src/lib.rs

NachoPal · 2023-08-10T10:53:29Z

@bkontur @muharem I'll proceed to merge

bkontur

ok, cool, lets go :),
we can still add imrpovements on the way :)

gilescope and others added 30 commits June 25, 2023 10:41

Allow functions to work over both parachains and relay chains

b0bb7ed

additional references

2aea880

import

6667656

backup

70b7840

add common trait Chain

e79196a

refactoring para and relay traits

9279a52

use runtime crates to build types

dbff3d9

decouple ProcessMessage

b602c94

decouple ProcessMessage 2

99b123a

dmp and xcmp handlers decouple

05ca59b

backup

e0776af

refactor done

84da33f

common int values working

68726e2

added global ext with mutex

c02e298

works for two mutex

2463414

single mutex and remove condvar

13fa6fa

global test ext done

461f4f6

failing moving test_ext because relay block num

ada9868

relay_block_number issue fixed

f81fbce

backup

6d1f729

Test working with assertions

f1f7e95

assertions get Test as arg

f703ae2

DispatchArgs as generic

ed56ae4

clean up

5696320

backup

a63cfeb

teleports for asset-hub-kusama done

0dba54d

improve assert_expected_events macro

ac7579d

rename Test generics

4e2fa1d

check assertions for tuples

58eea72

test assertions redone

2801073

gilescope reviewed Aug 2, 2023

View reviewed changes

xcm/xcm-emulator/src/lib.rs Show resolved Hide resolved

bkontur reviewed Aug 3, 2023

View reviewed changes

parachains/integration-tests/emulated/assets/asset-hub-kusama/Cargo.toml Outdated Show resolved Hide resolved

Removed unnecessary deps

bf1f301

bkontur reviewed Aug 3, 2023

View reviewed changes

xcm/xcm-emulator/src/lib.rs Show resolved Hide resolved

muharem reviewed Aug 3, 2023

View reviewed changes

gilescope reviewed Aug 4, 2023

View reviewed changes

parachains/integration-tests/emulated/assets/asset-hub-kusama/src/tests/reserve_transfer.rs Show resolved Hide resolved

gilescope approved these changes Aug 4, 2023

View reviewed changes

bkontur reviewed Aug 4, 2023

View reviewed changes

NachoPal added 4 commits August 5, 2023 00:20

address comments

9292c3a

rename event assertion helpers

6d74ac3

clean comments

f80b5f5

address comments 2

643438e

".git/.scripts/commands/fmt/fmt.sh"

f9beb02

muharem self-requested a review August 7, 2023 15:39

bkontur reviewed Aug 8, 2023

View reviewed changes

xcm/xcm-emulator/src/lib.rs Show resolved Hide resolved

bkontur approved these changes Aug 10, 2023

View reviewed changes

NachoPal merged commit f75df2a into master Aug 10, 2023

NachoPal deleted the nacho/add-xcm-emulator-tests branch August 10, 2023 17:38

NachoPal mentioned this pull request Aug 11, 2023

refactor XCM emulator #2988

Open

gilescope mentioned this pull request Aug 17, 2023

Revert #2958 #3026

Closed

nakul1010 mentioned this pull request Sep 5, 2023

Add XCM Test interlay/interbtc#1190

Open

crystalin mentioned this pull request Oct 20, 2023

Update substrate/polkadot/cumulus from v0.9.43 to v1.1.0 moonbeam-foundation/moonbeam#2535

Closed

JesseAbram mentioned this pull request Oct 26, 2023

Update substrate and subxt entropyxyz/entropy-core#435

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Replicate `e2e` integration test as `emulated` #2958

Replicate `e2e` integration test as `emulated` #2958

NachoPal commented Aug 1, 2023 •

edited

Loading

bkontur commented Aug 3, 2023

gilescope left a comment

bkontur Aug 4, 2023

bkontur Aug 4, 2023 •

edited

Loading

NachoPal Aug 4, 2023 •

edited

Loading

NachoPal Aug 4, 2023

bkontur Aug 7, 2023

NachoPal commented Aug 7, 2023

command-bot bot commented Aug 7, 2023 •

edited

Loading

command-bot bot commented Aug 7, 2023

NachoPal commented Aug 7, 2023

NachoPal commented Aug 10, 2023

bkontur left a comment

Replicate e2e integration test as emulated #2958

Replicate e2e integration test as emulated #2958

Conversation

NachoPal commented Aug 1, 2023 • edited Loading

bkontur commented Aug 3, 2023

gilescope left a comment

Choose a reason for hiding this comment

bkontur Aug 4, 2023

Choose a reason for hiding this comment

bkontur Aug 4, 2023 • edited Loading

Choose a reason for hiding this comment

NachoPal Aug 4, 2023 • edited Loading

Choose a reason for hiding this comment

NachoPal Aug 4, 2023

Choose a reason for hiding this comment

bkontur Aug 7, 2023

Choose a reason for hiding this comment

NachoPal commented Aug 7, 2023

command-bot bot commented Aug 7, 2023 • edited Loading

command-bot bot commented Aug 7, 2023

NachoPal commented Aug 7, 2023

NachoPal commented Aug 10, 2023

bkontur left a comment

Choose a reason for hiding this comment

Replicate `e2e` integration test as `emulated` #2958

Replicate `e2e` integration test as `emulated` #2958

NachoPal commented Aug 1, 2023 •

edited

Loading

bkontur Aug 4, 2023 •

edited

Loading

NachoPal Aug 4, 2023 •

edited

Loading

command-bot bot commented Aug 7, 2023 •

edited

Loading