From c81f9fdff48f950ea2c3deeebe4a89e72a6bc13b Mon Sep 17 00:00:00 2001 From: cuteolaf Date: Sun, 12 May 2024 23:56:47 -0700 Subject: [PATCH] restructure zombienet tests (#122) --- README.md | 59 ++++++++++++------- zombienet_tests/0002-native-fee-payment.zndsl | 10 ---- .../custom-fee-payment.toml} | 0 .../custom-fee-payment.zndsl} | 4 +- .../native-fee-payment.toml} | 0 .../fee-payment/native-fee-payment.zndsl | 10 ++++ .../block-production.toml} | 0 .../block-production.zndsl} | 2 +- .../delegated-governance.toml} | 0 .../delegated-governance.zndsl} | 4 +- .../native-governance.toml} | 0 .../native-governance.zndsl} | 4 +- .../asset-transfer.toml} | 0 .../asset-transfer.zndsl} | 4 +- .../region-transfer.toml} | 0 .../region-transfer.zndsl} | 4 +- 16 files changed, 59 insertions(+), 42 deletions(-) delete mode 100644 zombienet_tests/0002-native-fee-payment.zndsl rename zombienet_tests/{0003-custom-fee-payment.toml => fee-payment/custom-fee-payment.toml} (100%) rename zombienet_tests/{0003-custom-fee-payment.zndsl => fee-payment/custom-fee-payment.zndsl} (55%) rename zombienet_tests/{0002-native-fee-payment.toml => fee-payment/native-fee-payment.toml} (100%) create mode 100644 zombienet_tests/fee-payment/native-fee-payment.zndsl rename zombienet_tests/{0001-block-production.toml => general/block-production.toml} (100%) rename zombienet_tests/{0001-block-production.zndsl => general/block-production.zndsl} (85%) rename zombienet_tests/{0004-delegated-governance.toml => governance/delegated-governance.toml} (100%) rename zombienet_tests/{0004-delegated-governance.zndsl => governance/delegated-governance.zndsl} (56%) rename zombienet_tests/{0005-native-governance.toml => governance/native-governance.toml} (100%) rename zombienet_tests/{0005-native-governance.zndsl => governance/native-governance.zndsl} (57%) rename zombienet_tests/{0006-asset-transfer.toml => xc-transfer/asset-transfer.toml} (100%) rename zombienet_tests/{0006-asset-transfer.zndsl => xc-transfer/asset-transfer.zndsl} (58%) rename zombienet_tests/{0007-region-transfer.toml => xc-transfer/region-transfer.toml} (100%) rename zombienet_tests/{0007-region-transfer.zndsl => xc-transfer/region-transfer.zndsl} (54%) diff --git a/README.md b/README.md index 47b96630..efebbb09 100644 --- a/README.md +++ b/README.md @@ -20,34 +20,51 @@ ``` 4. Run the tests: - - - block production + - block production - ``` - zombienet-linux -p native test ./zombienet_tests/0001-block-production.zndsl - ``` - - native fee payment + ``` + zombienet-linux -p native test ./zombienet_tests/general/block-production.zndsl + ``` - ``` - zombienet-linux -p native test ./zombienet_tests/0002-native-fee-payment.zndsl - ``` + - fee payment + - fee payment in native tokens - - custom fee payment + ``` + zombienet-linux -p native test ./zombienet_tests/fee-payment/native-fee-payment.zndsl + ``` - ``` - zombienet-linux -p native test ./zombienet_tests/0003-custom-fee-payment.zndsl - ``` + - fee payment in custom assets - - delegated governance(relay chain token holders) + ``` + zombienet-linux -p native test ./zombienet_tests/fee-payment/custom-fee-payment.zndsl + ``` - ``` - zombienet-linux -p native test ./zombienet_tests/0004-delegated-governance.zndsl - ``` + - governance - - native governance(RegionX token holders) + - delegated governance(relay chain token holders) - ``` - zombienet-linux -p native test ./zombienet_tests/0005-native-governance.zndsl - ``` \ No newline at end of file + ``` + zombienet-linux -p native test ./zombienet_tests/governance/delegated-governance.zndsl + ``` + + - native governance(RegionX token holders) + + ``` + zombienet-linux -p native test ./zombienet_tests/governance/native-governance.zndsl + ``` + + - cross-chain transfer + + - transfer assets + + ``` + zombienet-linux -p native test ./zombienet_tests/xc-transfer/asset-transfer.zndsl + ``` + + - transfer regions + + ``` + zombienet-linux -p native test ./zombienet_tests/xc-transfer/region-transfer.zndsl + ``` \ No newline at end of file diff --git a/zombienet_tests/0002-native-fee-payment.zndsl b/zombienet_tests/0002-native-fee-payment.zndsl deleted file mode 100644 index 7eaae633..00000000 --- a/zombienet_tests/0002-native-fee-payment.zndsl +++ /dev/null @@ -1,10 +0,0 @@ -Description: Native currency fee payment -Network: ./0002-native-fee-payment.toml -Creds: config - -alice: is up -bob: is up - -alice: parachain 2000 is registered within 225 seconds - -regionx-collator01: js-script ../e2e_tests/build/fee-payment/native.js return is 0 within 200 seconds diff --git a/zombienet_tests/0003-custom-fee-payment.toml b/zombienet_tests/fee-payment/custom-fee-payment.toml similarity index 100% rename from zombienet_tests/0003-custom-fee-payment.toml rename to zombienet_tests/fee-payment/custom-fee-payment.toml diff --git a/zombienet_tests/0003-custom-fee-payment.zndsl b/zombienet_tests/fee-payment/custom-fee-payment.zndsl similarity index 55% rename from zombienet_tests/0003-custom-fee-payment.zndsl rename to zombienet_tests/fee-payment/custom-fee-payment.zndsl index 75ec1d28..2bc22868 100644 --- a/zombienet_tests/0003-custom-fee-payment.zndsl +++ b/zombienet_tests/fee-payment/custom-fee-payment.zndsl @@ -1,5 +1,5 @@ Description: Custom currency fee payment -Network: ./0003-custom-fee-payment.toml +Network: ./custom-fee-payment.toml Creds: config rococo-validator01: is up @@ -7,4 +7,4 @@ rococo-validator02: is up rococo-validator01: parachain 2000 is registered within 225 seconds -regionx-collator01: js-script ../e2e_tests/build/fee-payment/custom.js return is 0 within 400 seconds +regionx-collator01: js-script ../../e2e_tests/build/fee-payment/custom.js return is 0 within 400 seconds diff --git a/zombienet_tests/0002-native-fee-payment.toml b/zombienet_tests/fee-payment/native-fee-payment.toml similarity index 100% rename from zombienet_tests/0002-native-fee-payment.toml rename to zombienet_tests/fee-payment/native-fee-payment.toml diff --git a/zombienet_tests/fee-payment/native-fee-payment.zndsl b/zombienet_tests/fee-payment/native-fee-payment.zndsl new file mode 100644 index 00000000..af818e33 --- /dev/null +++ b/zombienet_tests/fee-payment/native-fee-payment.zndsl @@ -0,0 +1,10 @@ +Description: Native currency fee payment +Network: ./native-fee-payment.toml +Creds: config + +alice: is up +bob: is up + +alice: parachain 2000 is registered within 225 seconds + +regionx-collator01: js-script ../../e2e_tests/build/fee-payment/native.js return is 0 within 200 seconds diff --git a/zombienet_tests/0001-block-production.toml b/zombienet_tests/general/block-production.toml similarity index 100% rename from zombienet_tests/0001-block-production.toml rename to zombienet_tests/general/block-production.toml diff --git a/zombienet_tests/0001-block-production.zndsl b/zombienet_tests/general/block-production.zndsl similarity index 85% rename from zombienet_tests/0001-block-production.zndsl rename to zombienet_tests/general/block-production.zndsl index 30f2bec5..0cd554ad 100644 --- a/zombienet_tests/0001-block-production.zndsl +++ b/zombienet_tests/general/block-production.zndsl @@ -1,5 +1,5 @@ Description: Block production smoke test -Network: ./0001-block-production.toml +Network: ./block-production.toml Creds: config alice: is up diff --git a/zombienet_tests/0004-delegated-governance.toml b/zombienet_tests/governance/delegated-governance.toml similarity index 100% rename from zombienet_tests/0004-delegated-governance.toml rename to zombienet_tests/governance/delegated-governance.toml diff --git a/zombienet_tests/0004-delegated-governance.zndsl b/zombienet_tests/governance/delegated-governance.zndsl similarity index 56% rename from zombienet_tests/0004-delegated-governance.zndsl rename to zombienet_tests/governance/delegated-governance.zndsl index 3c286414..ca1a29ba 100644 --- a/zombienet_tests/0004-delegated-governance.zndsl +++ b/zombienet_tests/governance/delegated-governance.zndsl @@ -1,5 +1,5 @@ Description: Governance by relay chain token holders -Network: ./0004-delegated-governance.toml +Network: ./delegated-governance.toml Creds: config rococo-validator01: is up @@ -7,4 +7,4 @@ rococo-validator02: is up rococo-validator01: parachain 2000 is registered within 225 seconds -regionx-collator01: js-script ../e2e_tests/build/governance/delegated.js return is 0 within 400 seconds +regionx-collator01: js-script ../../e2e_tests/build/governance/delegated.js return is 0 within 400 seconds diff --git a/zombienet_tests/0005-native-governance.toml b/zombienet_tests/governance/native-governance.toml similarity index 100% rename from zombienet_tests/0005-native-governance.toml rename to zombienet_tests/governance/native-governance.toml diff --git a/zombienet_tests/0005-native-governance.zndsl b/zombienet_tests/governance/native-governance.zndsl similarity index 57% rename from zombienet_tests/0005-native-governance.zndsl rename to zombienet_tests/governance/native-governance.zndsl index ee0c02b8..6a72a2da 100644 --- a/zombienet_tests/0005-native-governance.zndsl +++ b/zombienet_tests/governance/native-governance.zndsl @@ -1,5 +1,5 @@ Description: Governance by RegionX token holders -Network: ./0005-native-governance.toml +Network: ./native-governance.toml Creds: config rococo-validator01: is up @@ -7,4 +7,4 @@ rococo-validator02: is up rococo-validator01: parachain 2000 is registered within 225 seconds -regionx-collator01: js-script ../e2e_tests/build/governance/native.js return is 0 within 400 seconds +regionx-collator01: js-script ../../e2e_tests/build/governance/native.js return is 0 within 400 seconds diff --git a/zombienet_tests/0006-asset-transfer.toml b/zombienet_tests/xc-transfer/asset-transfer.toml similarity index 100% rename from zombienet_tests/0006-asset-transfer.toml rename to zombienet_tests/xc-transfer/asset-transfer.toml diff --git a/zombienet_tests/0006-asset-transfer.zndsl b/zombienet_tests/xc-transfer/asset-transfer.zndsl similarity index 58% rename from zombienet_tests/0006-asset-transfer.zndsl rename to zombienet_tests/xc-transfer/asset-transfer.zndsl index 5c838441..0272d354 100644 --- a/zombienet_tests/0006-asset-transfer.zndsl +++ b/zombienet_tests/xc-transfer/asset-transfer.zndsl @@ -1,5 +1,5 @@ Description: Cross chain transfer between RegionX and the relay chain -Network: ./0006-asset-transfer.toml +Network: ./asset-transfer.toml Creds: config rococo-validator01: is up @@ -7,5 +7,5 @@ rococo-validator02: is up rococo-validator01: parachain 2000 is registered within 225 seconds -regionx-collator01: js-script ../e2e_tests/build/xc-transfer/asset-transfer.js return is 0 within 400 seconds +regionx-collator01: js-script ../../e2e_tests/build/xc-transfer/asset-transfer.js return is 0 within 400 seconds diff --git a/zombienet_tests/0007-region-transfer.toml b/zombienet_tests/xc-transfer/region-transfer.toml similarity index 100% rename from zombienet_tests/0007-region-transfer.toml rename to zombienet_tests/xc-transfer/region-transfer.toml diff --git a/zombienet_tests/0007-region-transfer.zndsl b/zombienet_tests/xc-transfer/region-transfer.zndsl similarity index 54% rename from zombienet_tests/0007-region-transfer.zndsl rename to zombienet_tests/xc-transfer/region-transfer.zndsl index 7b87cfb0..d3d2cf20 100644 --- a/zombienet_tests/0007-region-transfer.zndsl +++ b/zombienet_tests/xc-transfer/region-transfer.zndsl @@ -1,5 +1,5 @@ Description: Native currency fee payment -Network: ./0007-region-transfer.toml +Network: ./region-transfer.toml Creds: config rococo-validator01: is up @@ -7,4 +7,4 @@ rococo-validator02: is up rococo-validator01: parachain 2000 is registered within 225 seconds -regionx-collator01: js-script ../e2e_tests/build/xc-transfer/region-transfer.js return is 0 within 600 seconds +regionx-collator01: js-script ../../e2e_tests/build/xc-transfer/region-transfer.js return is 0 within 600 seconds