From 4ca9138cc0db546390d2d863d28719901966dd33 Mon Sep 17 00:00:00 2001 From: NachoPal Date: Mon, 26 Sep 2022 12:47:42 +0200 Subject: [PATCH 1/2] update it --- .../integration-tests/statemine/xcm/1_dmp.yml | 8 +- .../integration-tests/statemine/xcm/2_ump.yml | 4 +- .../statemine/xcm/3_hrmp-open-channels.yml | 4 +- .../statemine/xcm/4_hrmp.yml | 6 +- .../integration-tests/statemint/xcm/1_dmp.yml | 8 +- .../integration-tests/statemint/xcm/2_ump.yml | 4 +- .../statemint/xcm/3_hrmp-open-channels.yml | 4 +- .../statemint/xcm/4_hrmp.yml | 133 +++++++++++++++++- 8 files changed, 149 insertions(+), 22 deletions(-) diff --git a/parachains/integration-tests/statemine/xcm/1_dmp.yml b/parachains/integration-tests/statemine/xcm/1_dmp.yml index b5040c740c0..85c0271e793 100644 --- a/parachains/integration-tests/statemine/xcm/1_dmp.yml +++ b/parachains/integration-tests/statemine/xcm/1_dmp.yml @@ -77,7 +77,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 4,000,000,000 + value: 1,015,543,000 - queries: balance_rc_sender_after: chain: *relay_chain @@ -148,7 +148,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,016,375,000 - queries: forced_created_asset: chain: *assets_parachain @@ -215,8 +215,8 @@ tests: chain: *assets_parachain attribute: type: XcmV2TraitsOutcome - isIncomplete: true - value: ['1,000,000,000' , UntrustedReserveLocation] + isError: true + value: "WeightNotComputable" - queries: balance_rc_sender_after: chain: *relay_chain diff --git a/parachains/integration-tests/statemine/xcm/2_ump.yml b/parachains/integration-tests/statemine/xcm/2_ump.yml index 6c8a816d163..cea059fd491 100644 --- a/parachains/integration-tests/statemine/xcm/2_ump.yml +++ b/parachains/integration-tests/statemine/xcm/2_ump.yml @@ -62,7 +62,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 4,000,000,000 + value: 1,015,543,000 - name: Get the balances of the Assets Parachain's sender & Relay Chain's receiver actions: @@ -97,7 +97,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 354,190,000 - name: ump.ExecutedUpward chain: *relay_chain attribute: diff --git a/parachains/integration-tests/statemine/xcm/3_hrmp-open-channels.yml b/parachains/integration-tests/statemine/xcm/3_hrmp-open-channels.yml index ee4b946cb48..aa78334c6b8 100644 --- a/parachains/integration-tests/statemine/xcm/3_hrmp-open-channels.yml +++ b/parachains/integration-tests/statemine/xcm/3_hrmp-open-channels.yml @@ -259,7 +259,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,016,375,000 - name: polkadotXcm.Sent chain: *assets_parachain - name: ump.ExecutedUpward @@ -324,7 +324,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,016,375,000 - name: polkadotXcm.Sent chain: *assets_parachain - name: ump.ExecutedUpward diff --git a/parachains/integration-tests/statemine/xcm/4_hrmp.yml b/parachains/integration-tests/statemine/xcm/4_hrmp.yml index febec32af73..414fc6fe678 100644 --- a/parachains/integration-tests/statemine/xcm/4_hrmp.yml +++ b/parachains/integration-tests/statemine/xcm/4_hrmp.yml @@ -87,7 +87,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,016,375,000 - queries: forced_created_asset: chain: *assets_parachain @@ -168,7 +168,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 1,000,000,000 + value: 649,386,000 - name: assets.Transferred attribute: type: AccountId32 @@ -215,7 +215,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 1,000,000,000 + value: 649,386,000 - name: balances.Endowed attribute: type: AccountId32 diff --git a/parachains/integration-tests/statemint/xcm/1_dmp.yml b/parachains/integration-tests/statemint/xcm/1_dmp.yml index 02e5b864bf3..e0a82e47731 100644 --- a/parachains/integration-tests/statemint/xcm/1_dmp.yml +++ b/parachains/integration-tests/statemint/xcm/1_dmp.yml @@ -77,7 +77,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 4,000,000,000 + value: 1,022,566,000 - queries: balance_rc_sender_after: chain: *relay_chain @@ -148,7 +148,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,020,265,000 - queries: forced_created_asset: chain: *assets_parachain @@ -215,8 +215,8 @@ tests: chain: *assets_parachain attribute: type: XcmV2TraitsOutcome - isIncomplete: true - value: ['1,000,000,000' , UntrustedReserveLocation] + isError: true + value: "WeightNotComputable" - queries: balance_rc_sender_after: chain: *relay_chain diff --git a/parachains/integration-tests/statemint/xcm/2_ump.yml b/parachains/integration-tests/statemint/xcm/2_ump.yml index c20872ca687..53fe0ff3e0b 100644 --- a/parachains/integration-tests/statemint/xcm/2_ump.yml +++ b/parachains/integration-tests/statemint/xcm/2_ump.yml @@ -62,7 +62,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 4,000,000,000 + value: 1,022,566,000 - name: Get the balances of the Assets Parachain's sender & Relay Chain's receiver actions: @@ -98,7 +98,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 359,002,000 - name: ump.ExecutedUpward chain: *relay_chain attribute: diff --git a/parachains/integration-tests/statemint/xcm/3_hrmp-open-channels.yml b/parachains/integration-tests/statemint/xcm/3_hrmp-open-channels.yml index a164ce9c98d..5cd57da78ac 100644 --- a/parachains/integration-tests/statemint/xcm/3_hrmp-open-channels.yml +++ b/parachains/integration-tests/statemint/xcm/3_hrmp-open-channels.yml @@ -257,7 +257,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,020,265,000 - name: polkadotXcm.Sent chain: *assets_parachain - name: ump.ExecutedUpward @@ -322,7 +322,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,020,265,000 - name: polkadotXcm.Sent chain: *assets_parachain - name: ump.ExecutedUpward diff --git a/parachains/integration-tests/statemint/xcm/4_hrmp.yml b/parachains/integration-tests/statemint/xcm/4_hrmp.yml index b6e5d4ff9d6..1dc2856f444 100644 --- a/parachains/integration-tests/statemint/xcm/4_hrmp.yml +++ b/parachains/integration-tests/statemint/xcm/4_hrmp.yml @@ -87,7 +87,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 2,000,000,000 + value: 1,020,265,000 - queries: forced_created_asset: chain: *assets_parachain @@ -167,7 +167,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 1,000,000,000 + value: 655,068,000 - name: assets.Transferred attribute: type: AccountId32 @@ -214,7 +214,7 @@ tests: attribute: type: XcmV2TraitsOutcome isComplete: true - value: 1,000,000,000 + value: 655,068,000 - name: balances.Endowed attribute: type: AccountId32 @@ -223,3 +223,130 @@ tests: attribute: type: u128 value: *amount + + # - name: polkadotXcm.send( system.remarkWithEvent() ) | Penpal Parachain -> Assets Parachain + # before: + # - name: Get the asset balance of the Penpal Parachain Sovereign account in Assets Parachain + # actions: + # - queries: + # assets_balance_pp_sovereign_before: + # chain: *assets_parachain + # pallet: assets + # call: account + # args: [ + # *asset_id, + # *pp_sovereign_sibl + # ] + # its: + # - name: Penpal Parachain should be able to send XCM message paying its fee with sufficient asset in Assets Parachain + # actions: + # - extrinsics: + # - chain: *penpal_parachain + # signer: *pp_signer + # sudo: true + # pallet: polkadotXcm + # call: send + # args: [ + # *ap_dest_routed, # destination + # { + # v2: [ #message + # { + # WithdrawAsset: [*ap_suff_asset_fungible] + # }, + # { + # BuyExecution: { + # fees: *ap_suff_asset_fungible, + # weightLimit: Unlimited + # } + # }, + # { + # Transact: { + # originType: SovereignAccount, + # requireWeightAtMost: *weight_at_most, + # call: $system_remark_with_event + # } + # } + # ] + # } + # ] + # events: + # - name: sudo.Sudid + # attribute: + # type: Result + # value: Ok + # - name: polkadotXcm.Sent + # - name: assets.Burned + # chain: *assets_parachain + # attribute: + # type: AccountId32 + # value: *pp_sovereign_sibl + # - name: assets.Issued + # chain: *assets_parachain + # attribute: + # type: u32 + # value: *asset_id + # - name: system.Remarked + # chain: *assets_parachain + # attribute: + # type: AccountId32 + # value: *pp_sovereign_sibl + # - queries: + # assets_balance_pp_sovereign_after: + # chain: *assets_parachain + # pallet: assets + # call: account + # args: [ + # *asset_id, + # *pp_sovereign_sibl + # ] + + # - name: Should reduce the assets balance of the Penpal Parachain's SovereignAccount in the Assets Parachain + # actions: + # - asserts: + # assetsDecreased: + # args: [ + # { + # balances: { + # before: $assets_balance_pp_sovereign_before, + # after: $assets_balance_pp_sovereign_after, + # }, + # } + # ] + + # - name: Penpal Parachain SHOULD NOT be able to send XCM message paying its fee with sufficient assets if not enough balance + # actions: + # - extrinsics: + # - chain: *penpal_parachain + # signer: *pp_signer + # sudo: true + # pallet: polkadotXcm + # call: send + # args: [ + # *ap_dest_routed, # destination + # { + # v2: [ #message + # { + # WithdrawAsset: [*ap_suff_asset_fungible_fail] + # }, + # { + # BuyExecution: { + # fees: *ap_suff_asset_fungible_fail, + # weightLimit: Unlimited + # } + # }, + # { + # Transact: { + # originType: SovereignAccount, + # requireWeightAtMost: *weight_at_most, + # call: $system_remark_with_event + # } + # } + # ] + # } + # ] + # events: + # - name: xcmpQueue.Fail + # chain: *assets_parachain + # attribute: + # type: XcmV2TraitsError + # value: FailedToTransactAsset From 1db771be651132a245d89ca93b8e5b91ab1a8248 Mon Sep 17 00:00:00 2001 From: NachoPal Date: Mon, 26 Sep 2022 12:50:01 +0200 Subject: [PATCH 2/2] remove comment --- .../statemint/xcm/4_hrmp.yml | 127 ------------------ 1 file changed, 127 deletions(-) diff --git a/parachains/integration-tests/statemint/xcm/4_hrmp.yml b/parachains/integration-tests/statemint/xcm/4_hrmp.yml index 1dc2856f444..12e052d794a 100644 --- a/parachains/integration-tests/statemint/xcm/4_hrmp.yml +++ b/parachains/integration-tests/statemint/xcm/4_hrmp.yml @@ -223,130 +223,3 @@ tests: attribute: type: u128 value: *amount - - # - name: polkadotXcm.send( system.remarkWithEvent() ) | Penpal Parachain -> Assets Parachain - # before: - # - name: Get the asset balance of the Penpal Parachain Sovereign account in Assets Parachain - # actions: - # - queries: - # assets_balance_pp_sovereign_before: - # chain: *assets_parachain - # pallet: assets - # call: account - # args: [ - # *asset_id, - # *pp_sovereign_sibl - # ] - # its: - # - name: Penpal Parachain should be able to send XCM message paying its fee with sufficient asset in Assets Parachain - # actions: - # - extrinsics: - # - chain: *penpal_parachain - # signer: *pp_signer - # sudo: true - # pallet: polkadotXcm - # call: send - # args: [ - # *ap_dest_routed, # destination - # { - # v2: [ #message - # { - # WithdrawAsset: [*ap_suff_asset_fungible] - # }, - # { - # BuyExecution: { - # fees: *ap_suff_asset_fungible, - # weightLimit: Unlimited - # } - # }, - # { - # Transact: { - # originType: SovereignAccount, - # requireWeightAtMost: *weight_at_most, - # call: $system_remark_with_event - # } - # } - # ] - # } - # ] - # events: - # - name: sudo.Sudid - # attribute: - # type: Result - # value: Ok - # - name: polkadotXcm.Sent - # - name: assets.Burned - # chain: *assets_parachain - # attribute: - # type: AccountId32 - # value: *pp_sovereign_sibl - # - name: assets.Issued - # chain: *assets_parachain - # attribute: - # type: u32 - # value: *asset_id - # - name: system.Remarked - # chain: *assets_parachain - # attribute: - # type: AccountId32 - # value: *pp_sovereign_sibl - # - queries: - # assets_balance_pp_sovereign_after: - # chain: *assets_parachain - # pallet: assets - # call: account - # args: [ - # *asset_id, - # *pp_sovereign_sibl - # ] - - # - name: Should reduce the assets balance of the Penpal Parachain's SovereignAccount in the Assets Parachain - # actions: - # - asserts: - # assetsDecreased: - # args: [ - # { - # balances: { - # before: $assets_balance_pp_sovereign_before, - # after: $assets_balance_pp_sovereign_after, - # }, - # } - # ] - - # - name: Penpal Parachain SHOULD NOT be able to send XCM message paying its fee with sufficient assets if not enough balance - # actions: - # - extrinsics: - # - chain: *penpal_parachain - # signer: *pp_signer - # sudo: true - # pallet: polkadotXcm - # call: send - # args: [ - # *ap_dest_routed, # destination - # { - # v2: [ #message - # { - # WithdrawAsset: [*ap_suff_asset_fungible_fail] - # }, - # { - # BuyExecution: { - # fees: *ap_suff_asset_fungible_fail, - # weightLimit: Unlimited - # } - # }, - # { - # Transact: { - # originType: SovereignAccount, - # requireWeightAtMost: *weight_at_most, - # call: $system_remark_with_event - # } - # } - # ] - # } - # ] - # events: - # - name: xcmpQueue.Fail - # chain: *assets_parachain - # attribute: - # type: XcmV2TraitsError - # value: FailedToTransactAsset