From 6fa979a651e623b73e4fe96b1ec97499e7191941 Mon Sep 17 00:00:00 2001
From: Pavel Murygin <Pavel.Murygin@gmail.com>
Date: Fri, 18 Mar 2022 15:46:30 +0300
Subject: [PATCH] Extract aqua function out of yaml files

---
 .github/check_connection.aqua          |  7 +++++++
 .github/deploy.aqua                    |  8 ++++++++
 .github/workflows/check-connection.yml | 12 ++----------
 .github/workflows/check-deploy.yml     | 13 ++-----------
 4 files changed, 19 insertions(+), 21 deletions(-)
 create mode 100644 .github/check_connection.aqua
 create mode 100644 .github/deploy.aqua

diff --git a/.github/check_connection.aqua b/.github/check_connection.aqua
new file mode 100644
index 0000000..86e0c29
--- /dev/null
+++ b/.github/check_connection.aqua
@@ -0,0 +1,7 @@
+service Op:
+  noop() ->
+
+func check_connection() -> string:
+  on HOST_PEER_ID:
+    Op.noop()
+  <- "ok"
\ No newline at end of file
diff --git a/.github/deploy.aqua b/.github/deploy.aqua
new file mode 100644
index 0000000..ed50228
--- /dev/null
+++ b/.github/deploy.aqua
@@ -0,0 +1,8 @@
+service CallParameters:
+  call_parameters() -> string
+
+func call(service_id: string) -> string:
+  on HOST_PEER_ID:
+    CallParameters service_id
+    r <- CallParameters.call_parameters()
+    <- r
\ No newline at end of file
diff --git a/.github/workflows/check-connection.yml b/.github/workflows/check-connection.yml
index 596c2c0..1ca680d 100644
--- a/.github/workflows/check-connection.yml
+++ b/.github/workflows/check-connection.yml
@@ -70,17 +70,9 @@ jobs:
         run: |
           set -x
           NODE="/ip4/127.0.0.1/tcp/4310/ws/p2p/12D3KooWKEprYXUXqoV5xSBeyqrWLpQLLH4PXfvVkDJtmcqmh5V3"
+          INPUT=$GITHUB_WORKSPACE/.github/check_connection.aqua
 
-          echo "
-service Op:
-  noop() ->
-
-func check_connection() -> string:
-  on HOST_PEER_ID:
-    Op.noop()
-  <- "ok"
-" > /tmp/check_connection.aqua
-          RESULT=$(aqua run --addr ${{ matrix.node }} --sk qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqo= -f 'check_connection()' --input /tmp/call.aqua)
+          RESULT=$(aqua run --addr ${{ matrix.node }} --sk qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqo= -f 'check_connection()' --input $INPUT)
           
           if [ "$RESULT" -neq "ok" ]; then
             echo "Failed to connect to ${{ matrix.node }}"
diff --git a/.github/workflows/check-deploy.yml b/.github/workflows/check-deploy.yml
index 8f0586f..743293f 100644
--- a/.github/workflows/check-deploy.yml
+++ b/.github/workflows/check-deploy.yml
@@ -53,18 +53,9 @@ jobs:
           set -x
           NODE="/ip4/127.0.0.1/tcp/4310/ws/p2p/12D3KooWKEprYXUXqoV5xSBeyqrWLpQLLH4PXfvVkDJtmcqmh5V3"
           SERVICE_ID=`./deploy.sh $NODE`
+          INPUT=$GITHUB_WORKSPACE/.github/deploy.aqua
 
-          echo "
-service CallParameters:
-  call_parameters() -> string
-
-func call(service_id: string) -> string:
-  on HOST_PEER_ID:
-    CallParameters service_id
-    r <- CallParameters.call_parameters()
-    <- r
-" > /tmp/call.aqua
-          RESULT=$(aqua run --addr $NODE --sk qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqo= -f 'call(service_id)' -d '{"service_id": "'$SERVICE_ID'"}' --input /tmp/call.aqua)
+          RESULT=$(aqua run --addr $NODE --sk qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqo= -f 'call(service_id)' -d '{"service_id": "'$SERVICE_ID'"}' --input $INPUT)
           
           EXPECTED_PEER_ID=$(echo -e "$RESULT" | sed -n '1p' | grep -o '12D3.*')
           RESULT_PEER_ID=$(echo -e "$RESULT" | sed -n '2p' | tr -d \")