From 5c91c70b78fdb8f6bfae3a3def3973056c9b4d47 Mon Sep 17 00:00:00 2001 From: Ignacio Palacios Date: Wed, 24 May 2023 20:07:22 +0200 Subject: [PATCH] Update & revamp e2e tests (#2614) * update & revamp e2e tests * add seeds as comments * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: command-bot <> --- cumulus/client/network/src/lib.rs | 21 +++-- .../e2e/assets/statemine/0_xcm/0_init.yml | 51 +++++------- .../e2e/assets/statemine/0_xcm/1_dmp.yml | 78 +++++++++---------- .../e2e/assets/statemine/0_xcm/2_ump.yml | 73 +++++++---------- ...els.yml => 3_force_hrmp-open-channels.yml} | 52 +++++-------- .../e2e/assets/statemine/0_xcm/4_hrmp.yml | 71 +++++++---------- .../e2e/assets/statemine/config.toml | 5 +- .../e2e/assets/statemint/0_xcm/0_init.yml | 39 ++++------ .../e2e/assets/statemint/0_xcm/1_dmp.yml | 77 +++++++++--------- .../e2e/assets/statemint/0_xcm/2_ump.yml | 67 +++++++--------- ...els.yml => 3_force_hrmp-open-channels.yml} | 44 ++++------- .../e2e/assets/statemint/0_xcm/4_hrmp.yml | 75 ++++++++---------- .../e2e/assets/statemint/config.toml | 5 +- .../0_xcm/0_init.yml | 34 ++++---- .../0_xcm/1_teleport.yml | 39 ++++------ .../0_xcm/2_reserve.yml | 20 +++-- .../1_alliance/0_join_alliance_fails.yml | 17 ++-- .../1_alliance/1_init_alliance.yml | 78 +++++++------------ .../1_alliance/2_join_alliance_fails.yml | 18 ++--- .../1_alliance/3_kick_member.yml | 47 ++++------- .../config.toml | 13 ++-- 21 files changed, 392 insertions(+), 532 deletions(-) rename cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/{3_hrmp-open-channels.yml => 3_force_hrmp-open-channels.yml} (66%) rename cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/{3_hrmp-open-channels.yml => 3_force_hrmp-open-channels.yml} (72%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/0_xcm/0_init.yml (79%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/0_xcm/1_teleport.yml (85%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/0_xcm/2_reserve.yml (71%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/1_alliance/0_join_alliance_fails.yml (53%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/1_alliance/1_init_alliance.yml (79%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/1_alliance/2_join_alliance_fails.yml (53%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/1_alliance/3_kick_member.yml (82%) rename cumulus/parachains/integration-tests/e2e/collectives/{collectives_polkadot => collectives-polkadot}/config.toml (78%) diff --git a/cumulus/client/network/src/lib.rs b/cumulus/client/network/src/lib.rs index 0c15ab3add..e226170d7c 100644 --- a/cumulus/client/network/src/lib.rs +++ b/cumulus/client/network/src/lib.rs @@ -89,14 +89,13 @@ impl BlockAnnounceData { /// /// This will not check the signature, for this you should use [`BlockAnnounceData::check_signature`]. fn validate(&self, encoded_header: Vec) -> Result<(), Validation> { - let candidate_hash = if let CompactStatement::Seconded(h) = - self.statement.unchecked_payload() - { - h - } else { - tracing::debug!(target: LOG_TARGET, "`CompactStatement` isn't the candidate variant!",); - return Err(Validation::Failure { disconnect: true }) - }; + let candidate_hash = + if let CompactStatement::Seconded(h) = self.statement.unchecked_payload() { + h + } else { + tracing::debug!(target: LOG_TARGET, "`CompactStatement` isn't the candidate variant!",); + return Err(Validation::Failure { disconnect: true }) + }; if *candidate_hash != self.receipt.hash() { tracing::debug!( @@ -334,9 +333,9 @@ where let relay_chain_is_syncing = relay_chain_interface .is_major_syncing() .await - .map_err(|e| { - tracing::error!(target: LOG_TARGET, "Unable to determine sync status. {}", e) - }) + .map_err( + |e| tracing::error!(target: LOG_TARGET, "Unable to determine sync status. {}", e), + ) .unwrap_or(false); if relay_chain_is_syncing { diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/0_init.yml b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/0_init.yml index b770c8e569..ebcbe417bb 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/0_init.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/0_init.yml @@ -11,8 +11,9 @@ settings: paraId: &pp_id 2000 variables: common: - xcm_version: &xcm_version '3' + xcm_version: &xcm_version 3 require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 200000} + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } chains: relay_chain: signer: &rc_signer //Alice @@ -56,13 +57,9 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.SupportedVersionChanged - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 0, interior: { X1: { Parachain: *ap_id }}}, *xcm_version ] - extrinsics: # Relay Chain sets supported version for Penpal Parachain - chain: *relay_chain sudo: true @@ -82,13 +79,9 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.SupportedVersionChanged - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 0, interior: { X1: { Parachain: *pp_id }}}, *xcm_version ] - extrinsics: # Asset Parachain sets supported version for Relay Chain through it - chain: *relay_chain signer: *rc_signer @@ -101,11 +94,11 @@ tests: v3: [ #message { UnpaidExecution: { - weightLimit: { - limited: { - refTime: 2200000000, - proofSize: 200000 - } + weightLimit: { + limited: { + refTime: 2200000000, + proofSize: 200000 + } } } }, @@ -121,15 +114,17 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent + - name: dmpQueue.ExecutedDownward + chain: *assets_parachain + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '1,019,210,000', proofSize: '200,000' }} + } - name: polkadotXcm.SupportedVersionChanged chain: *assets_parachain - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 1, interior: Here }, *xcm_version ] - extrinsics: # Penpal Parachain sets supported version for Relay Chain - chain: *penpal_parachain signer: *pp_signer @@ -145,10 +140,6 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: polkadotXcm.SupportedVersionChanged - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 1, interior: Here }, *xcm_version ] diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/1_dmp.yml b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/1_dmp.yml index 0852a3907d..1fb4a8abb8 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/1_dmp.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/1_dmp.yml @@ -7,20 +7,23 @@ settings: wsPort: 9910 paraId: &ap_id 1000 variables: - relay_chain: - signer: &rc_signer //Alice - wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F - assets_parachain_destination: &ap_dest { v3: { parents: 0, interior: { x1: { parachain: *ap_id }}}} - assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' - assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} - ksm: &rc_ksm { concrete: { parents: 0, interior: { here: true }}} - amount: &amount 1000000000000 - ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} - require_weight_at_most: &rc_weight_at_most {refTime: 1000000000, proofSize: 200000} - assets_parachain_account: - wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F - asset_id: &asset_id 1 - asset_min_balance: &asset_ed 1000 + common: + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } + chains: + relay_chain: + signer: &rc_signer //Alice + wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + assets_parachain_destination: &ap_dest { v3: { parents: 0, interior: { x1: { parachain: *ap_id }}}} + assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' + assets_parachain_beneficiary: &ap_benf { v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} + ksm: &rc_ksm { concrete: { parents: 0, interior: { here: true }}} + amount: &amount 1000000000000 + ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} + require_weight_at_most: &rc_weight_at_most { refTime: 1000000000, proofSize: 200000 } + assets_parachain_account: + wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + asset_id: &asset_id 1 + asset_min_balance: &asset_ed 1000 decodedCalls: force_create_asset: chain: *assets_parachain @@ -69,16 +72,14 @@ tests: ] events: - name: xcmPallet.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: [{ Complete: { refTime: '764,772,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"162,379,000","proofSize":"0"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }} + } - queries: balance_rc_sender_after: chain: *relay_chain @@ -151,11 +152,10 @@ tests: - name: xcmPallet.Sent - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"1,014,103,000","proofSize":"200,000"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '1,014,103,000', proofSize: '200,000' }} + } - queries: forced_created_asset: chain: *assets_parachain @@ -196,9 +196,7 @@ tests: ] events: - name: system.ExtrinsicFailed - attributes: - - type: SpRuntimeDispatchError - value: BadOrigin + result: { dispatchError: BadOrigin } - name: xcmPallet.limitedReserveTransferAssets before: *before_get_balances @@ -219,17 +217,19 @@ tests: ] events: - name: xcmPallet.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"750,645,000","proofSize":"0"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '750,645,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Incomplete - value: [{"refTime":"1,000,000,000","proofSize":"0"},"UntrustedReserveLocation"] + threshold: *weight_threshold + result: { + outcome: { + Incomplete: [ + { refTime: '1,000,000,000', proofSize: 0 }, + UntrustedReserveLocation + ] + } + } - queries: balance_rc_sender_after: chain: *relay_chain diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/2_ump.yml b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/2_ump.yml index 46519da3fd..3cdb9547c3 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/2_ump.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/2_ump.yml @@ -10,22 +10,24 @@ settings: common: amount: &amount 1000000000000 require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 0} - relay_chain: - signer: &rc_signer //Alice - wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F #Alice - assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}} - assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' - assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} - ksm: &rc_ksm { concrete: { 0, interior: { here: true }}} - ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} - assets_parachain_account: - signer: &ap_signer //Alice - wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F - relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}} - assets_parachain_account: &rc_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' #Alice - relay_chain_beneficiary: &rc_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *rc_acc }}}}} - ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}} - ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }} + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } + chains: + relay_chain: + signer: &rc_signer //Alice + wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F #Alice + assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}} + assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' + assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} + ksm: &rc_ksm { concrete: { 0, interior: { here: true }}} + ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} + assets_parachain_account: + signer: &ap_signer //Alice + wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}} + assets_parachain_account: &rc_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' #Alice + relay_chain_beneficiary: &rc_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *rc_acc }}}}} + ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}} + ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }} decodedCalls: system_remark: chain: *relay_chain @@ -54,18 +56,14 @@ tests: ] events: - name: xcmPallet.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"761,173,000","proofSize":"0"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '761,173,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"162,379,000","proofSize":"0"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }} + } - name: Get the balances of the Assets Parachain's sender & Relay Chain's receiver actions: @@ -97,18 +95,12 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"539,494,000","proofSize":"7,133"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '539,494,000', proofSize: '7,133' }}] - name: ump.ExecutedUpward chain: *relay_chain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"298,716,000","proofSize":"0"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '298,716,000', proofSize: 0 }}] - queries: balance_ap_sender_after: chain: *assets_parachain @@ -178,9 +170,7 @@ tests: ] events: - name: system.ExtrinsicFailed - attributes: - - type: SpRuntimeDispatchError - value: BadOrigin + result: { dispatchError: BadOrigin } - name: polkadotXcm.limitedReserveTransferAssets its: @@ -200,7 +190,4 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Error - value: Barrier + result: [{ Error: Barrier }] diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/3_hrmp-open-channels.yml b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/3_force_hrmp-open-channels.yml similarity index 66% rename from cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/3_hrmp-open-channels.yml rename to cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/3_force_hrmp-open-channels.yml index cc1fc9da14..dfdae028f0 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/3_hrmp-open-channels.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/3_force_hrmp-open-channels.yml @@ -3,23 +3,22 @@ settings: chains: relay_chain: &relay_chain wsPort: 9900 - assets_parachain: &assets_parachain + assets_parachain: wsPort: 9910 paraId: &ap_id 1000 - penpal_parachain: &penpal_parachain + penpal_parachain: wsPort: 9920 paraId: &pp_id 2000 variables: common: amount: &amount 2000000000000 - require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 20000} hrmp_channels: proposed_max_capacity: &max_capacity 8 proposed_max_message_size: &max_message_size 8192 channel: &channel { - maxCapacity: 8, - maxTotalSize: 8192, - maxMessageSize: 8192, + maxCapacity: *max_capacity, + maxTotalSize: *max_message_size, + maxMessageSize: *max_message_size, msgCount: 0, totalSize: 0, mqcHead: null, @@ -29,17 +28,10 @@ settings: chains: relay_chain: signer: &rc_signer //Alice - assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}} - assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' - assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} - ksm: &rc_ksm { concrete: { 0, interior: { here: true }}} - ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} assets_parachain_account: sovereign_account: &ap_sovereign F7fq1jSNVTPfJmaHaXCMtatT1EZefCUsa7rRiQVNR5efcah - relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}} penpal_parachain: sovereign_account: &pp_sovereign F7fq1jMZkfuCuoMTyiEVAP2DMpMt18WopgBqTJznLihLNbZ - signer: &pp_signer //Alice tests: - name: HRMP @@ -72,7 +64,7 @@ tests: events: - name: balances.Transfer describes: - - name: hrmp.hrmpInitOpenChannel (Penpal Parachain → Assets Parachain) + - name: hrmp.forceOpenHrmpChannel (Penpal Parachain → Assets Parachain) its: - name: Open Penpal Parachain to Assets Parachain actions: @@ -83,18 +75,17 @@ tests: pallet: hrmp call: forceOpenHrmpChannel args: [ - 2000, - 1000, - 8, - 8192 + *pp_id, + *ap_id, + *max_capacity, + *max_message_size ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: hrmp.HrmpChannelForceOpened - - name: hrmp.hrmpInitOpenChannel (Assets Parachain → PenPal Parachain) + + - name: hrmp.forceOpenHrmpChannel (Assets Parachain → PenPal Parachain) its: - name: Open Assets Parachain to PenPal Parachain actions: @@ -105,17 +96,16 @@ tests: pallet: hrmp call: forceOpenHrmpChannel args: [ - 1000, - 2000, - 8, - 8192 + *ap_id, + *pp_id, + *max_capacity, + *max_message_size ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: hrmp.HrmpChannelForceOpened + - name: hrmp.forceProcessHrmpOpen (make sure all the channels are open) its: - name: Make sure all the pending channels are open @@ -129,6 +119,4 @@ tests: args: [ 2 ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/4_hrmp.yml b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/4_hrmp.yml index e47ae5a405..9e2decffe1 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/4_hrmp.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemine/0_xcm/4_hrmp.yml @@ -17,6 +17,7 @@ settings: amount: &amount 100000000000 require_weight_at_most: &weight_at_most {refTime: 1200000000, proofSize: 20000} amount_to_send: &amount_to_send 500000000000 + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } chains: relay_chain: signer: &rc_signer //Alice @@ -83,7 +84,7 @@ tests: } }, { - SetTopic: "0x0123456789012345678901234567891201234567890123456789012345678912" + SetTopic: '0x0123456789012345678901234567891201234567890123456789012345678912' }, { Transact: { @@ -99,11 +100,10 @@ tests: - name: xcmPallet.Sent - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"1,216,703,000","proofSize":"20,000"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '1,216,703,000', proofSize: '20,000' }} + } - queries: forced_created_asset: chain: *assets_parachain @@ -128,6 +128,7 @@ tests: ] events: - name: assets.Issued + result: { assetId: *asset_id, owner: *ap_wallet, amount: *mint_amount } its: - name: Assets Parachain should be able to reserve transfer an Asset to Penpal Parachain @@ -180,19 +181,15 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"679,150,000","proofSize":"6,196"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '679,150,000', proofSize: '6,196' }}] - name: assets.Transferred - attributes: - - type: AccountId32 - value: *pp_sovereign_sibl - - name: assets.Transferred - attributes: - - type: u128 - value: *amount_to_send + result: { + assetId: *asset_id, + from: *ap_wallet, + to: *pp_sovereign_sibl, + amount: *amount_to_send + } - name: polkadotXcm.limitedReserveTransferAssets (KSM) | Assets Parachain -> Penpal Parachain its: @@ -227,19 +224,13 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"679,150,000","proofSize":"6,196"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '679,150,000', proofSize: '6,196' }}] - name: balances.Endowed - attributes: - - type: AccountId32 - value: *pp_sovereign_sibl - - name: balances.Endowed - attributes: - - type: u128 - value: *amount + result: { + account: *pp_sovereign_sibl, + freeBalance: *amount + } - name: polkadotXcm.send( assets.forceCreateAsset ) | Penpal Parachain -> Assets Parachain before: @@ -320,20 +311,14 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: polkadotXcm.Sent - name: assets.Burned chain: *assets_parachain - attributes: - - type: AccountId32 - value: *pp_sovereign_sibl + result: { assetId: *asset_id, owner: *pp_sovereign_sibl } - name: assets.Issued chain: *assets_parachain - attributes: - - type: u32 - value: *asset_id + result: { assetId: *asset_id } - queries: assets_balance_pp_sovereign_after: chain: *assets_parachain @@ -398,6 +383,8 @@ tests: events: - name: xcmpQueue.Fail chain: *assets_parachain - attributes: - - type: XcmV3TraitsError - value: FailedToTransactAsset + threshold: *weight_threshold + result: { + error: FailedToTransactAsset, + weight: { refTime: '152,426,000', proofSize: '3,593' } + } diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemine/config.toml b/cumulus/parachains/integration-tests/e2e/assets/statemine/config.toml index 6aa7ee8d11..57c8f37e24 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemine/config.toml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemine/config.toml @@ -7,6 +7,7 @@ chain = "kusama-local" name = "alice" ws_port = 9900 validator = true + args = ["--state-cache-size=0"] [[relaychain.nodes]] name = "bob" @@ -32,7 +33,7 @@ cumulus_based = true name = "collator1" ws_port = 9910 command = "./bin/polkadot-parachain" - args = [ "-lxcm=trace" ] + args = [ "-lxcm=trace", "--state-cache-size=0" ] [[parachains.collators]] name = "collator2" @@ -49,7 +50,7 @@ cumulus_based = true name = "collator3" ws_port = 9920 command = "./bin/polkadot-parachain" - args = [ "-lxcm=trace" ] + args = [ "-lxcm=trace", "--state-cache-size=0" ] [[parachains.collators]] name = "collator4" diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/0_init.yml b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/0_init.yml index 95c77f72d0..55dbab6ba4 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/0_init.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/0_init.yml @@ -13,6 +13,7 @@ settings: common: xcm_version: &xcm_version '3' require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 200000} + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } chains: relay_chain: signer: &rc_signer //Alice @@ -56,13 +57,9 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.SupportedVersionChanged - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 0, interior: { X1: { Parachain: *ap_id }}}, *xcm_version ] - extrinsics: # Relay Chain sets supported version for Penpal Parachain - chain: *relay_chain sudo: true @@ -82,13 +79,9 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.SupportedVersionChanged - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 0, interior: { X1: { Parachain: *pp_id }}}, *xcm_version ] - extrinsics: # Asset Parachain sets supported version for Relay Chain through it - chain: *relay_chain signer: *rc_signer @@ -121,15 +114,17 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent + - name: dmpQueue.ExecutedDownward + chain: *assets_parachain + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '1,019,210,000', proofSize: '200,000' }} + } - name: polkadotXcm.SupportedVersionChanged chain: *assets_parachain - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 1, interior: Here }, *xcm_version ] - extrinsics: # Penpal Parachain sets supported version for Relay Chain - chain: *penpal_parachain signer: *pp_signer @@ -145,10 +140,6 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: polkadotXcm.SupportedVersionChanged - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 1, interior: Here }, *xcm_version ] diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/1_dmp.yml b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/1_dmp.yml index 96a97ba728..823974ad80 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/1_dmp.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/1_dmp.yml @@ -7,20 +7,23 @@ settings: wsPort: 9810 paraId: &ap_id 1000 variables: - relay_chain: - signer: &rc_signer //Alice - wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F - assets_parachain_destination: &ap_dest { v3: { parents: 0, interior: { x1: { parachain: *ap_id }}}} - assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' - assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} - ksm: &rc_ksm { concrete: { parents: 0, interior: { here: true }}} - amount: &amount 1000000000000 - ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} - require_weight_at_most: &rc_weight_at_most {refTime: 1000000000, proofSize: 200000} - assets_parachain_account: - wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F - asset_id: &asset_id 1 - asset_min_balance: &asset_ed 1000 + common: + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } + chains: + relay_chain: + signer: &rc_signer //Alice + wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + assets_parachain_destination: &ap_dest { v3: { parents: 0, interior: { x1: { parachain: *ap_id }}}} + assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' + assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} + ksm: &rc_ksm { concrete: { parents: 0, interior: { here: true }}} + amount: &amount 1000000000000 + ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} + require_weight_at_most: &rc_weight_at_most {refTime: 1000000000, proofSize: 200000} + assets_parachain_account: + wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + asset_id: &asset_id 1 + asset_min_balance: &asset_ed 1000 decodedCalls: force_create_asset: chain: *assets_parachain @@ -69,16 +72,14 @@ tests: ] events: - name: xcmPallet.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: [{ Complete: { refTime: '3,000,000,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"162,909,000","proofSize":"0"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }} + } - queries: balance_rc_sender_after: chain: *relay_chain @@ -151,11 +152,10 @@ tests: - name: xcmPallet.Sent - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"1,015,234,000","proofSize":"200,000"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '1,014,103,000', proofSize: '200,000' }} + } - queries: forced_created_asset: chain: *assets_parachain @@ -196,9 +196,7 @@ tests: ] events: - name: system.ExtrinsicFailed - attributes: - - type: SpRuntimeDispatchError - value: BadOrigin + result: { dispatchError: BadOrigin } - name: xcmPallet.limitedReserveTransferAssets before: *before_get_balances @@ -219,16 +217,19 @@ tests: ] events: - name: xcmPallet.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - value: {"refTime":"2,000,000,000","proofSize":"0"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '2,000,000,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Incomplete - value: [{"refTime":"1,000,000,000","proofSize":"0"},"UntrustedReserveLocation"] + threshold: *weight_threshold + result: { + outcome: { + Incomplete: [ + { refTime: '1,000,000,000', proofSize: 0 }, + UntrustedReserveLocation + ] + } + } - queries: balance_rc_sender_after: chain: *relay_chain diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/2_ump.yml b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/2_ump.yml index d839375320..4bdeceb765 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/2_ump.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/2_ump.yml @@ -10,22 +10,24 @@ settings: common: amount: &amount 1000000000000 require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 0} - relay_chain: - signer: &rc_signer //Alice - wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F - assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}} - assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' - assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} - ksm: &rc_ksm { concrete: { 0, interior: { here: true }}} - ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} - assets_parachain_account: - signer: &ap_signer //Alice - wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F - relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}} - assets_parachain_account: &rc_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' - relay_chain_beneficiary: &rc_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *rc_acc }}}}} - ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}} - ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }} + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } + chains: + relay_chain: + signer: &rc_signer //Alice + wallet: &rc_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}} + assets_parachain_account: &ap_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' + assets_parachain_beneficiary: &ap_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *ap_acc }}}}} + ksm: &rc_ksm { concrete: { 0, interior: { here: true }}} + ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} + assets_parachain_account: + signer: &ap_signer //Alice + wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}} + assets_parachain_account: &rc_acc '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' + relay_chain_beneficiary: &rc_benf {v3: { parents: 0, interior: { x1: { accountId32: { id: *rc_acc }}}}} + ksm: &ap_ksm { concrete: { parents: 1, interior: { here: true }}} + ksm_fungible: &ap_ksm_fungible { id: *ap_ksm, fun: { fungible: *amount }} decodedCalls: system_remark: chain: *relay_chain @@ -54,17 +56,14 @@ tests: ] events: - name: xcmPallet.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - value: {"refTime":"3,000,000,000","proofSize":"0"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '3,000,000,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"162,909,000","proofSize":"0"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '166,944,000', proofSize: 0 }} + } - name: Get the balances of the Assets Parachain's sender & Relay Chain's receiver actions: @@ -97,17 +96,12 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"533,283,000","proofSize":"7,096"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '533,283,000', proofSize: '7,096' }}] - name: ump.ExecutedUpward chain: *relay_chain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - value: {"refTime":"4,000,000,000","proofSize":"0"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '4,000,000,000', proofSize: 0 }}] - queries: balance_ap_sender_after: chain: *assets_parachain @@ -199,7 +193,4 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Error - value: Barrier + result: [{ Error: Barrier }] diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/3_hrmp-open-channels.yml b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/3_force_hrmp-open-channels.yml similarity index 72% rename from cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/3_hrmp-open-channels.yml rename to cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/3_force_hrmp-open-channels.yml index a274282df3..ecf344a073 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/3_hrmp-open-channels.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/3_force_hrmp-open-channels.yml @@ -3,23 +3,22 @@ settings: chains: relay_chain: &relay_chain wsPort: 9800 - assets_parachain: &assets_parachain + assets_parachain: wsPort: 9810 paraId: &ap_id 1000 - penpal_parachain: &penpal_parachain + penpal_parachain: wsPort: 9820 paraId: &pp_id 2000 variables: common: amount: &amount 2000000000000 - require_weight_at_most: &weight_at_most {refTime: 1000000000, proofSize: 20000} hrmp_channels: proposed_max_capacity: &max_capacity 8 proposed_max_message_size: &max_message_size 8192 channel: &channel { - maxCapacity: 8, - maxTotalSize: 8192, - maxMessageSize: 8192, + maxCapacity: *max_capacity, + maxTotalSize: *max_message_size, + maxMessageSize: *max_message_size, msgCount: 0, totalSize: 0, mqcHead: null, @@ -29,15 +28,10 @@ settings: chains: relay_chain: signer: &rc_signer //Alice - assets_parachain_destination: &ap_dest { v3: { 0, interior: { x1: { parachain: *ap_id }}}} - ksm: &rc_ksm { concrete: { 0, interior: { here: true }}} - ksm_fungible: &rc_ksm_fungible { id: *rc_ksm, fun: { fungible: *amount }} assets_parachain_account: sovereign_account: &ap_sovereign 5Ec4AhPZk8STuex8Wsi9TwDtJQxKqzPJRCH7348Xtcs9vZLJ - relay_chain_destination: &rc_dest { v3: { parents: 1, interior: { here: true }}} penpal_parachain: sovereign_account: &pp_sovereign F7fq1jMZkfuCuoMTyiEVAP2DMpMt18WopgBqTJznLihLNbZ - signer: &pp_signer //Alice tests: - name: HRMP @@ -81,16 +75,14 @@ tests: pallet: hrmp call: forceOpenHrmpChannel args: [ - 2000, - 1000, - 8, - 8192 + *pp_id, + *ap_id, + *max_capacity, + *max_message_size ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: hrmp.HrmpChannelForceOpened - name: hrmp.hrmpInitOpenChannel (Assets Parachain → PenPal Parachain) its: @@ -103,16 +95,14 @@ tests: pallet: hrmp call: forceOpenHrmpChannel args: [ - 1000, - 2000, - 8, - 8192 + *ap_id, + *pp_id, + *max_capacity, + *max_message_size ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: hrmp.HrmpChannelForceOpened - name: hrmp.forceProcessHrmpOpen (make sure all the channels are open) its: @@ -127,6 +117,4 @@ tests: args: [ 2 ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/4_hrmp.yml b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/4_hrmp.yml index c36192fd5a..4ff2fbc59a 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/4_hrmp.yml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemint/0_xcm/4_hrmp.yml @@ -1,4 +1,6 @@ --- +# Note: This tests depends on the 3_hrmp-open-channels.yml for opening channels, otherwise teleports aren't going to +# work. settings: chains: relay_chain: &relay_chain @@ -15,6 +17,7 @@ settings: amount: &amount 1000000000000 require_weight_at_most: &weight_at_most {refTime: 1200000000, proofSize: 20000} amount_to_send: &amount_to_send 500000000000 + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } chains: relay_chain: signer: &rc_signer //Alice @@ -22,7 +25,7 @@ settings: assets_parachain_dest_routed: &ap_dest_routed { v3: { parents: 1, interior: { x1: { parachain: *ap_id } }}} assets_parachain_account: signer: &ap_signer //Alice - wallet: &ap_wallet HNZata7iMYWmk5RvZRTiAsSDhV8366zq2YGb3tLH5Upf74F + wallet: &ap_wallet 15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5 asset_id: &asset_id 2 assets_pallet_id: &assets_pallet_id 50 asset_min_balance: &asset_ed 1000 @@ -81,7 +84,7 @@ tests: } }, { - SetTopic: "0x0123456789012345678901234567891201234567890123456789012345678912" + SetTopic: '0x0123456789012345678901234567891201234567890123456789012345678912' }, { Transact: { @@ -97,11 +100,10 @@ tests: - name: xcmPallet.Sent - name: dmpQueue.ExecutedDownward chain: *assets_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"1,218,405,000","proofSize":"20,000"} + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '1,216,703,000', proofSize: '20,000' }} + } - queries: forced_created_asset: chain: *assets_parachain @@ -126,6 +128,7 @@ tests: ] events: - name: assets.Issued + result: { assetId: *asset_id, owner: *ap_wallet, amount: *mint_amount } its: - name: Assets Parachain should be able to reserve transfer an Asset to Penpal Parachain @@ -178,19 +181,15 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"673,627,000","proofSize":"6,196"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '673,627,000', proofSize: '6,196' }}] - name: assets.Transferred - attributes: - - type: AccountId32 - value: *pp_sovereign_sibl - - name: assets.Transferred - attributes: - - type: u128 - value: *amount_to_send + result: { + assetId: *asset_id, + from: *ap_wallet, + to: *pp_sovereign_sibl, + amount: *amount_to_send + } - name: polkadotXcm.limitedReserveTransferAssets (KSM) | Assets Parachain -> Penpal Parachain its: @@ -225,19 +224,13 @@ tests: ] events: - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete - threshold: [10, 10] - value: {"refTime":"673,627,000","proofSize":"6,196"} + threshold: *weight_threshold + result: [{ Complete: { refTime: '679,150,000', proofSize: '6,196' }}] - name: balances.Endowed - attributes: - - type: AccountId32 - value: *pp_sovereign_sibl - - name: balances.Endowed - attributes: - - type: u128 - value: *amount + result: { + account: *pp_sovereign_sibl, + freeBalance: *amount + } - name: polkadotXcm.send( assets.forceCreateAsset ) | Penpal Parachain -> Assets Parachain before: @@ -318,20 +311,14 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: polkadotXcm.Sent - name: assets.Burned chain: *assets_parachain - attributes: - - type: AccountId32 - value: *pp_sovereign_sibl + result: { assetId: *asset_id, owner: *pp_sovereign_sibl } - name: assets.Issued chain: *assets_parachain - attributes: - - type: u32 - value: *asset_id + result: { assetId: *asset_id } - queries: assets_balance_pp_sovereign_after: chain: *assets_parachain @@ -396,6 +383,8 @@ tests: events: - name: xcmpQueue.Fail chain: *assets_parachain - attributes: - - type: XcmV3TraitsError - value: FailedToTransactAsset + threshold: *weight_threshold + result: { + error: FailedToTransactAsset, + weight: { refTime: '152,426,000', proofSize: '3,593' } + } diff --git a/cumulus/parachains/integration-tests/e2e/assets/statemint/config.toml b/cumulus/parachains/integration-tests/e2e/assets/statemint/config.toml index 5b5a861eed..2e68734e09 100644 --- a/cumulus/parachains/integration-tests/e2e/assets/statemint/config.toml +++ b/cumulus/parachains/integration-tests/e2e/assets/statemint/config.toml @@ -7,6 +7,7 @@ chain = "polkadot-local" name = "alice" ws_port = 9800 validator = true + args = ["--state-cache-size=0"] [[relaychain.nodes]] name = "bob" @@ -32,7 +33,7 @@ cumulus_based = true name = "collator1" ws_port = 9810 command = "./bin/polkadot-parachain" - args = [ "-lxcm=trace" ] + args = [ "-lxcm=trace", "--state-cache-size=0" ] [[parachains.collators]] name = "collator2" @@ -50,7 +51,7 @@ cumulus_based = true name = "collator3" ws_port = 9820 command = "./bin/polkadot-parachain" - args = [ "-lxcm=trace" ] + args = [ "-lxcm=trace", "--state-cache-size=0" ] [[parachains.collators]] name = "collator4" diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/0_init.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/0_init.yml similarity index 79% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/0_init.yml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/0_init.yml index 4dadb9f011..d482446952 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/0_init.yml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/0_init.yml @@ -7,12 +7,13 @@ settings: wsPort: 9710 paraId: &cp_id 1001 variables: - xcm_version: &xcm_version '3' + xcm_version: &xcm_version 3 + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } chains: accounts: alice_signer: &alice_signer //Alice decodedCalls: - ap_force_xcm_version: + cp_force_xcm_version: chain: *collectives_parachain pallet: polkadotXcm call: forceXcmVersion @@ -48,13 +49,9 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.SupportedVersionChanged - attributes: - - type: u32 - value: *xcm_version + result: [{ parents: 0, interior: { X1: { Parachain: *cp_id }}}, *xcm_version ] - extrinsics: # Collectives Parachain sets supported version for Relay Chain through it - chain: *relay_chain signer: *alice_signer @@ -82,7 +79,7 @@ tests: refTime: 200000000, # 200_000_000 proofSize: 0, }, - call: $ap_force_xcm_version + call: $cp_force_xcm_version } } ] @@ -90,17 +87,14 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent - - name: polkadotXcm.SupportedVersionChanged - chain: *collectives_parachain - attributes: - - type: u32 - value: *xcm_version - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '2,200,000,000', proofSize: 0 }} + } + - name: polkadotXcm.SupportedVersionChanged + chain: *collectives_parachain + result: [{ parents: 1, interior: Here }, *xcm_version ] diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/1_teleport.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/1_teleport.yml similarity index 85% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/1_teleport.yml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/1_teleport.yml index e6310d0592..2cd1fa6816 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/1_teleport.yml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/1_teleport.yml @@ -7,10 +7,13 @@ settings: wsPort: 9710 paraId: &cp_id 1001 variables: + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } accounts: alice_signer: &acc_alice_signer //Alice alice_account32: &acc_alice_acc32 '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' alice_ss58: &acc_alice_ss58 '15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5' + checking_account: &checking_account '13UVJyLnbVp9x5XDyJv8g8r3UddNwBrdaH7AADCmw9XQWvYW' + tests: - name: Teleport assets from Relay Chain to Collectives Parachain successful. @@ -57,15 +60,14 @@ tests: ] events: - name: xcmPallet.Attempted - chain: *relay_chain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: [{ Complete: { refTime: '3,000,000,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '4,000,000,000', proofSize: 0 }} + } - queries: balance_rc_alice_2: chain: *relay_chain @@ -121,28 +123,17 @@ tests: ] events: - name: balances.Withdraw - attributes: - - type: AccountId32 - key: who - value: *acc_alice_ss58 - - type: u128 - key: amount - value: 10000000000000 + result: { who: *acc_alice_ss58, amount: 10000000000000 } - name: polkadotXcm.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: [{ Complete: { refTime: '3,000,000,000', proofSize: 0 }}] - name: balances.Withdraw chain: *relay_chain - attributes: - - type: u128 - key: amount - value: 10000000000000 # amount received and withdrawn from registry account + result: { who: *checking_account, amount: 10000000000000 } # amount received and withdrawn from registry account - name: ump.ExecutedUpward chain: *relay_chain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: [{ Complete: { refTime: '4,000,000,000', proofSize: 0 }}] - queries: balance_rc_alice_3: chain: *relay_chain diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/2_reserve.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/2_reserve.yml similarity index 71% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/2_reserve.yml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/2_reserve.yml index b152d71de3..0695f1201b 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/0_xcm/2_reserve.yml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/0_xcm/2_reserve.yml @@ -7,11 +7,11 @@ settings: wsPort: 9710 paraId: &cp_id 1001 variables: + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } chains: accounts: alice_signer: &alice_signer //Alice alice_account32: &alice_acc32 '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' - alice_ss58: &acc_alice_ss58 '15oF4uVJwmo4TdGW7VfQxNLavjCXviqxT9S1MgbjMNHr6Sp5' tests: - name: Reserve assets from Relay Chain to Collectives Parachain fails @@ -38,12 +38,16 @@ tests: ] events: - name: xcmPallet.Attempted - chain: *relay_chain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: [{ Complete: { refTime: '2,000,000,000', proofSize: 0 }}] - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Incomplete + threshold: *weight_threshold + result: { + outcome: { + Incomplete: [ + { refTime: '1,000,000,000', proofSize: 0 }, + UntrustedReserveLocation + ] + } + } diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/0_join_alliance_fails.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/0_join_alliance_fails.yml similarity index 53% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/0_join_alliance_fails.yml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/0_join_alliance_fails.yml index 1177883056..9aff8b1db1 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/0_join_alliance_fails.yml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/0_join_alliance_fails.yml @@ -1,15 +1,13 @@ --- settings: chains: - relay_chain: &relay_chain + relay_chain: wsPort: 9700 collectives_parachain: &collectives_parachain wsPort: 9710 - paraId: &cp_id 1001 variables: accounts: alice_signer: &alice_signer //Alice - alice_account32: &cp_alice_acc32 '0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d' tests: - name: Alice fails to join an the Alliance, since it is not initialized yet. @@ -24,11 +22,8 @@ tests: args: [] events: - name: system.ExtrinsicFailed - attributes: - - type: SpRuntimeDispatchError - key: dispatchError - # TODO assert with Alliance Error variant - alliance.AllianceNotYetInitialized - # issue - https://github.com/paritytech/parachains-integration-tests/issues/59 - value: {"Module":{"index":"50","error":"0x00000000"}} - - + result: { + dispatchError: { Module: { index: 50, error: '0x00000000' }} + } + # TODO assert with Alliance Error variant - alliance.AllianceNotYetInitialized + # issue - https://github.com/paritytech/parachains-integration-tests/issues/59 diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/1_init_alliance.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/1_init_alliance.yml similarity index 79% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/1_init_alliance.yml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/1_init_alliance.yml index 26bd72a796..15140e6946 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/1_init_alliance.yml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/1_init_alliance.yml @@ -7,23 +7,16 @@ settings: wsPort: 9710 paraId: &coll_para_id 1001 variables: + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } accounts: alice_signer: &acc_alice_signer //Alice - alice_account32: &acc_alice_acc32 "0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d" - liam_signer: &acc_liam_signer //Liam - liam_account32: &acc_liam_acc32 "0x3614671a5de540d891eb8c4939c8153a4aa790602b347c18177b86d0fc546221" - olivia_signer: &acc_olivia_signer //Olivia - olivia_account32: &acc_olivia_acc32 "0x24ee8a659c6716fe9f7cb4e9e028602aa12867654ca02737da9171b7ff697d5c" - noah_signer: &acc_noah_signer //Noah - noah_account32: &acc_noah_acc32 "0x9c6ad3bc3aa2f1b2e837898e6da9980445f7ef8b3eee0b8c8e305f8cfae68517" - emma_signer: &acc_emma_signer //Emma - emma_account32: &acc_emma_acc32 "0x8ac272b333ba1127c8db57fa777ec820b24598a236efa648caf0d26d86f64572" - james_signer: &acc_james_signer //James - james_account32: &acc_james_acc32 "0x9a52805151a0b5effc084af9264011139872a21a3950cb9ae0b2955c4bf92c18" - ava_signer: &acc_ava_signer //Ava - ava_account32: &acc_ava_acc32 "0x348ef0b8776adbc09c862ddc29b1d193b9e24738e54eea3b0609c83856dc101c" - mia_signer: &acc_mia_signer //Mia - mia_account32: &acc_mia_acc32 "0xaebf15374cf7e758d10232514c569a7abf81cc1b8f1e81a73dbc608a0e335264" + liam_account32: &acc_liam_acc32 "0x3614671a5de540d891eb8c4939c8153a4aa790602b347c18177b86d0fc546221" # //Liam + olivia_account32: &acc_olivia_acc32 "0x24ee8a659c6716fe9f7cb4e9e028602aa12867654ca02737da9171b7ff697d5c" # //Olivia + noah_account32: &acc_noah_acc32 "0x9c6ad3bc3aa2f1b2e837898e6da9980445f7ef8b3eee0b8c8e305f8cfae68517" # //Noah + emma_account32: &acc_emma_acc32 "0x8ac272b333ba1127c8db57fa777ec820b24598a236efa648caf0d26d86f64572" # //Emma + james_account32: &acc_james_acc32 "0x9a52805151a0b5effc084af9264011139872a21a3950cb9ae0b2955c4bf92c18" # //James + ava_account32: &acc_ava_acc32 "0x348ef0b8776adbc09c862ddc29b1d193b9e24738e54eea3b0609c83856dc101c" # //Ava + mia_account32: &acc_mia_acc32 "0xaebf15374cf7e758d10232514c569a7abf81cc1b8f1e81a73dbc608a0e335264" # //Mia decodedCalls: init_alliance_members: chain: *collectives_parachain @@ -109,17 +102,16 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent - name: alliance.MembersInitialized chain: *collectives_parachain - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '3,000,000,000', proofSize: '1,000,000' }} + } - name: Alliance init call fails. actions: @@ -162,15 +154,14 @@ tests: # Next test with a disband call will fail, if this call does not fail, # since a witness data from a disband call will be invalid. - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '3,000,000,000', proofSize: '1,000,000' }} + } - name: Alliance disbanded and initialized again. actions: @@ -209,27 +200,17 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent - name: alliance.AllianceDisbanded chain: *collectives_parachain - attributes: - - type: u32 - key: fellowMembers - value: 6 - - type: u32 - key: allyMembers - value: 1 - - type: u32 - key: unreserved - value: 0 + result: { fellowMembers: 6, allyMembers: 1, unreserved: 0 } - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '3,321,495,872', proofSize: '181,779' }} + } - name: Alliance initiated, founders and fellows are set. actions: - extrinsics: @@ -267,14 +248,13 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent - name: alliance.MembersInitialized chain: *collectives_parachain - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '3,000,000,000', proofSize: '1,000,000' }} + } diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/2_join_alliance_fails.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/2_join_alliance_fails.yml similarity index 53% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/2_join_alliance_fails.yml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/2_join_alliance_fails.yml index 574df00451..2afdadae60 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/2_join_alliance_fails.yml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/2_join_alliance_fails.yml @@ -1,15 +1,14 @@ --- settings: chains: - relay_chain: &relay_chain + relay_chain: wsPort: 9700 collectives_parachain: &collectives_parachain wsPort: 9710 - paraId: &cp_id 1001 + paraId: 1001 variables: accounts: liam_signer: &acc_liam_signer //Liam - liam_account32: &acc_liam_acc32 "0x3614671a5de540d891eb8c4939c8153a4aa790602b347c18177b86d0fc546221" tests: - name: Liam fails to join an the Alliance, Liam is already a member. @@ -24,11 +23,8 @@ tests: args: [] events: - name: system.ExtrinsicFailed - attributes: - - type: SpRuntimeDispatchError - key: dispatchError - # TODO assert with Alliance Error variant - alliance.AllianceNotYetInitialized - # issue - https://github.com/paritytech/parachains-integration-tests/issues/59 - value: {"Module":{"index":"50","error":"0x02000000"}} - - + result: { + dispatchError: { Module: { index: 50, error: '0x02000000' }} + } + # TODO assert with Alliance Error variant - alliance.AllianceNotYetInitialized + # issue - https://github.com/paritytech/parachains-integration-tests/issues/59 diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/3_kick_member.yml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/3_kick_member.yml similarity index 82% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/3_kick_member.yml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/3_kick_member.yml index aac0988337..0c07a281e1 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/1_alliance/3_kick_member.yml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/1_alliance/3_kick_member.yml @@ -7,6 +7,7 @@ settings: wsPort: 9710 paraId: &cp_id 1001 variables: + weight_threshold: &weight_threshold { refTime: [10, 10], proofSize: [10, 10] } init_teleport_amount: &init_teleport_amount 20000000000000 # 20_000_000_000_000 accounts: alice_signer: &acc_alice_signer //Alice @@ -41,20 +42,17 @@ tests: ] events: - name: xcmPallet.Attempted - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: [{ Complete: { refTime: '3,000,000,000', proofSize: 0 }}] - name: balances.Deposit chain: *collectives_parachain - attributes: - - type: AccountId32 - key: who - value: *acc_alice_ss58 + result: { who: *acc_alice_ss58 } - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '4,000,000,000', proofSize: 0 }} + } - name: Get the balances of the Relay Chain's treasury & Collectives parachain's future alliance member actions: - queries: @@ -80,18 +78,9 @@ tests: events: - name: balances.Reserved chain: *collectives_parachain - attributes: - - type: AccountId32 - key: who - value: *acc_alice_ss58 - - type: u128 - key: amount - value: 10,000,000,000,000 + result: { who: *acc_alice_ss58, amount: '10,000,000,000,000' } - name: alliance.NewAllyJoined - attributes: - - type: AccountId32 - key: ally - value: *acc_alice_ss58 + result: { ally: *acc_alice_ss58 } - queries: balance_cp_alice_after: chain: *collectives_parachain @@ -148,21 +137,17 @@ tests: ] events: - name: sudo.Sudid - attributes: - - type: Result - value: Ok + result: { sudoResult: Ok } - name: xcmPallet.Sent - name: alliance.MemberKicked chain: *collectives_parachain - attributes: - - type: AccountId32 - key: member - value: *acc_alice_ss58 + result: { member: *acc_alice_ss58 } - name: dmpQueue.ExecutedDownward chain: *collectives_parachain - attributes: - - type: XcmV3TraitsOutcome - xcmOutcome: Complete + threshold: *weight_threshold + result: { + outcome: { Complete: { refTime: '4,000,000,000', proofSize: '1,000,000' }} + } - queries: balance_rc_treasury_after: diff --git a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/config.toml b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/config.toml similarity index 78% rename from cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/config.toml rename to cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/config.toml index d99e38078d..20fda92bd0 100644 --- a/cumulus/parachains/integration-tests/e2e/collectives/collectives_polkadot/config.toml +++ b/cumulus/parachains/integration-tests/e2e/collectives/collectives-polkadot/config.toml @@ -7,20 +7,21 @@ chain = "polkadot-local" name = "alice" ws_port = 9700 validator = true + args = ["--state-cache-size=0"] [[relaychain.nodes]] name = "bob" - ws_port = 9701 + ws_port = 9701 validator = true [[relaychain.nodes]] name = "charlie" - ws_port = 9702 + ws_port = 9702 validator = true - [[relaychain.nodes]] + [[relaychain.nodes]] name = "dave" - ws_port = 9703 + ws_port = 9703 validator = true [[parachains]] @@ -32,10 +33,10 @@ cumulus_based = true name = "collator1" ws_port = 9710 command = "./bin/polkadot-parachain" - args = ["-lxcm=trace"] + args = [ "-lxcm=trace", "--state-cache-size=0" ] [[parachains.collators]] name = "collator2" - ws_port = 9711 + ws_port = 9711 command = "./bin/polkadot-parachain" args = ["-lxcm=trace"]