From 936da6e686e6ca0feb0e9b2facd07e7bf2c0deab Mon Sep 17 00:00:00 2001
From: Masanori Yoshida <masanori.yoshida@datachain.jp>
Date: Fri, 13 Aug 2021 18:21:54 +0900
Subject: [PATCH] e2e: remove duplicate builds of yui-corda-ibc-client

Signed-off-by: Masanori Yoshida <masanori.yoshida@datachain.jp>
---
 .github/workflows/test.yml               |  5 ++++-
 tests/cases/corda2corda/scripts/init-rly | 10 ----------
 tests/cases/corda2corda/scripts/test-tx  |  3 +--
 tests/cases/corda2fab/scripts/init-rly   | 10 ----------
 tests/cases/corda2fab/scripts/test-tx    |  3 +--
 5 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 1b45e928..4670862b 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -140,6 +140,7 @@ jobs:
         run: |
           ./save_docker_images $CACHE_DOCKER_CORDA_DIR \
             yui-corda-ibc:latest \
+            yui-corda-ibc-client:latest \
             fabric-chaincode-org1:latest
 
   ethereum-build:
@@ -325,6 +326,7 @@ jobs:
         run: |
           ./load_docker_images $CACHE_DOCKER_CORDA_DIR \
              yui-corda-ibc:latest \
+             yui-corda-ibc-client:latest \
              fabric-chaincode-org1:latest
       - name: Run Test
         working-directory: ./tests/cases/corda2fab
@@ -357,7 +359,8 @@ jobs:
         working-directory: ./tests/scripts
         run: |
           ./load_docker_images $CACHE_DOCKER_CORDA_DIR \
-             yui-corda-ibc:latest
+             yui-corda-ibc:latest \
+             yui-corda-ibc-client:latest
       - name: Run Test
         working-directory: ./tests/cases/corda2corda
         run: |
diff --git a/tests/cases/corda2corda/scripts/init-rly b/tests/cases/corda2corda/scripts/init-rly
index 9aa21c04..04a80046 100755
--- a/tests/cases/corda2corda/scripts/init-rly
+++ b/tests/cases/corda2corda/scripts/init-rly
@@ -9,16 +9,6 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/uly
 RLY="${RLY_BINARY} --debug"
 FIXTURES_DIR=${SCRIPT_DIR}/../fixtures
 
-CORDA_CLI_DIR="${SCRIPT_DIR}/../../../chains/corda/yui-corda-ibc/rust"
-CORDA_CLI="${CORDA_CLI_DIR}/target/release/yui-corda-ibc-client"
-
-# Ensure ${RLY_BINARY} is installed
-(cd ${CORDA_CLI_DIR} && cargo build --release)
-if ! [ -x ${CORDA_CLI} ]; then
-  echo "Error: ${CORDA_CLI} is not installed." >&2
-  exit 1
-fi
-
 echo "Generating ${RLY_BINARY} configurations..."
 
 # Ensure ${RLY_BINARY} is installed
diff --git a/tests/cases/corda2corda/scripts/test-tx b/tests/cases/corda2corda/scripts/test-tx
index fbd7baa7..5c903ddf 100755
--- a/tests/cases/corda2corda/scripts/test-tx
+++ b/tests/cases/corda2corda/scripts/test-tx
@@ -6,8 +6,7 @@ SCRIPT_DIR=$(cd $(dirname $0); pwd)
 RLY_BINARY=${SCRIPT_DIR}/../../../../build/uly
 RLY="${RLY_BINARY} --debug"
 
-CORDA_CLI_DIR="${SCRIPT_DIR}/../../../chains/corda/yui-corda-ibc/rust"
-CORDA_CLI="${CORDA_CLI_DIR}/target/release/yui-corda-ibc-client"
+CORDA_CLI='docker run --rm --userns host --network host yui-corda-ibc-client yui-corda-ibc-client'
 
 # Ensure ${CHAIN_BINARY} is installed
 if ! [ -x ${CHAIN_BINARY} ]; then
diff --git a/tests/cases/corda2fab/scripts/init-rly b/tests/cases/corda2fab/scripts/init-rly
index 651091f7..2d6ef71a 100755
--- a/tests/cases/corda2fab/scripts/init-rly
+++ b/tests/cases/corda2fab/scripts/init-rly
@@ -9,16 +9,6 @@ RLY_BINARY=${SCRIPT_DIR}/../../../../build/uly
 RLY="${RLY_BINARY} --debug"
 FIXTURES_DIR=${SCRIPT_DIR}/../fixtures
 
-CORDA_CLI_DIR="${SCRIPT_DIR}/../../../chains/corda/yui-corda-ibc/rust"
-CORDA_CLI="${CORDA_CLI_DIR}/target/release/yui-corda-ibc-client"
-
-# Ensure ${RLY_BINARY} is installed
-(cd ${CORDA_CLI_DIR} && cargo build --release)
-if ! [ -x ${CORDA_CLI} ]; then
-  echo "Error: ${CORDA_CLI} is not installed." >&2
-  exit 1
-fi
-
 echo "Generating ${RLY_BINARY} configurations..."
 
 # Ensure ${RLY_BINARY} is installed
diff --git a/tests/cases/corda2fab/scripts/test-tx b/tests/cases/corda2fab/scripts/test-tx
index d57a5a5f..47ab3ccd 100755
--- a/tests/cases/corda2fab/scripts/test-tx
+++ b/tests/cases/corda2fab/scripts/test-tx
@@ -6,8 +6,7 @@ SCRIPT_DIR=$(cd $(dirname $0); pwd)
 RLY_BINARY=${SCRIPT_DIR}/../../../../build/uly
 RLY="${RLY_BINARY} --debug"
 
-CORDA_CLI_DIR="${SCRIPT_DIR}/../../../chains/corda/yui-corda-ibc/rust"
-CORDA_CLI="${CORDA_CLI_DIR}/target/release/yui-corda-ibc-client"
+CORDA_CLI='docker run --rm --userns host --network host yui-corda-ibc-client yui-corda-ibc-client'
 
 # Ensure ${CHAIN_BINARY} is installed
 if ! [ -x ${CHAIN_BINARY} ]; then