From 7d6068dea4c3aba5f161981e57b0cb06cbcc9ddb Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Mon, 18 Sep 2023 15:48:54 +0200
Subject: [PATCH 1/2] Zombienet test with preopen hrmp with zombienet

---
 .gitlab/pipeline/zombienet/cumulus.yml        | 12 ++++
 .../tests/0008-parachains-preopen-hrmp.toml   | 60 +++++++++++++++++++
 .../tests/0008-parachains-preopen-hrmp.zndsl  | 15 +++++
 3 files changed, 87 insertions(+)
 create mode 100644 cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml
 create mode 100644 cumulus/zombienet/tests/0008-parachains-preopen-hrmp.zndsl

diff --git a/.gitlab/pipeline/zombienet/cumulus.yml b/.gitlab/pipeline/zombienet/cumulus.yml
index 3347eda1baae..c17b7fb58b93 100644
--- a/.gitlab/pipeline/zombienet/cumulus.yml
+++ b/.gitlab/pipeline/zombienet/cumulus.yml
@@ -142,3 +142,15 @@ zombienet-cumulus-0007-full_node_warp_sync:
       --local-dir="${LOCAL_DIR}"
       --concurrency=1
       --test="0007-full_node_warp_sync.zndsl"
+
+zombienet-cumulus-0008-parachains-preopen-hrmp:
+  extends:
+    - .zombienet-cumulus-common
+    - .zombienet-refs
+    - .zombienet-before-script
+    - .zombienet-after-script
+  script:
+    - /home/nonroot/zombie-net/scripts/ci/run-test-local-env-manager.sh
+      --local-dir="${LOCAL_DIR}"
+      --concurrency=1
+      --test="0008-parachains-preopen-hrmp.zndsl"
\ No newline at end of file
diff --git a/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml b/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml
new file mode 100644
index 000000000000..ea5abeb56ab5
--- /dev/null
+++ b/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml
@@ -0,0 +1,60 @@
+[settings]
+timeout = 1000
+
+[relaychain]
+#default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
+default_command = "/home/bparity/local_bridge_testing/bin-rowo/polkadot"
+default_args = [ "-lparachain=debug,xcm=trace" ]
+chain = "rococo-local"
+
+
+  [[relaychain.nodes]]
+  name = "alice"
+  args = [ "-lparachain=debug,runtime=debug" ]
+
+  [[relaychain.nodes]]
+  name = "bob"
+  args = [ "-lparachain=debug,runtime=debug" ]
+
+  [[relaychain.nodes]]
+  name = "charlie"
+  args = [ "-lparachain=debug,runtime=debug" ]
+
+  [[relaychain.nodes]]
+  name = "dave"
+  args = [ "-lparachain=debug,runtime=debug" ]
+
+
+[[parachains]]
+id = 2000
+cumulus_based = true
+
+  [parachains.collator]
+  name = "collator01"
+  validator = true
+  image = "{{COL_IMAGE}}"
+  command = "test-parachain"
+  args = ["-lparachain=debug"]
+
+[[parachains]]
+id = 2001
+cumulus_based = true
+
+  [parachains.collator]
+  name = "collator02"
+  validator = false
+  image = "{{COL_IMAGE}}"
+  command = "test-parachain"
+  args = ["-lparachain=debug"]
+
+[[hrmp_channels]]
+sender = 2000
+recipient = 2001
+max_capacity = 2
+max_message_size = 262144
+
+[[hrmp_channels]]
+sender = 2001
+recipient = 2000
+max_capacity = 2
+max_message_size = 262144
diff --git a/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.zndsl b/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.zndsl
new file mode 100644
index 000000000000..2608a3f1f4bc
--- /dev/null
+++ b/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.zndsl
@@ -0,0 +1,15 @@
+Description: Check that relay chain can preopen HRMP channels between parachains.
+Network: ./0008-parachains-preopen-hrmp.toml
+Creds: config
+
+alice: parachain 2000 block height is at least 10 within 200 seconds
+bob: parachain 2001 block height is at least 10 within 200 seconds
+charlie: parachain 2000 block height is at least 10 within 200 seconds
+dave: parachain 2001 block height is at least 10 within 200 seconds
+
+# TODO: some js checks for chainstate on relay
+
+collator01: reports block height is at least 1 within 120 seconds
+collator02: reports block height is at least 1 within 120 seconds
+
+# TODO: some js checks for chainstate on parachain
\ No newline at end of file

From 08f7ef7f1965b676df368ecd14ba2011814b3e78 Mon Sep 17 00:00:00 2001
From: Branislav Kontur <bkontur@gmail.com>
Date: Tue, 19 Sep 2023 10:19:24 +0200
Subject: [PATCH 2/2] Fix relay command

---
 cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml b/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml
index ea5abeb56ab5..61caa186639a 100644
--- a/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml
+++ b/cumulus/zombienet/tests/0008-parachains-preopen-hrmp.toml
@@ -2,8 +2,8 @@
 timeout = 1000
 
 [relaychain]
-#default_image = "{{ZOMBIENET_INTEGRATION_TEST_IMAGE}}"
-default_command = "/home/bparity/local_bridge_testing/bin-rowo/polkadot"
+default_image = "{{RELAY_IMAGE}}"
+default_command = "polkadot"
 default_args = [ "-lparachain=debug,xcm=trace" ]
 chain = "rococo-local"