From 9a7c2432955709c9dade9d0b56c602af855dad47 Mon Sep 17 00:00:00 2001
From: Kirill Fedoseev <k.fedoseev@innopolis.university>
Date: Mon, 11 Nov 2019 19:51:05 +0300
Subject: [PATCH] Updated run.sh scripts for test services

---
 .gitignore                                  | 1 -
 src/test-services/.keys.development.example | 1 -
 src/test-services/binanceBalance/run.sh     | 6 +++++-
 src/test-services/binanceSend/run.sh        | 6 +++++-
 src/test-services/ethereumBalance/run.sh    | 6 +++++-
 src/test-services/ethereumSend/run.sh       | 6 +++++-
 src/test-services/sidePrefund/run.sh        | 6 +++++-
 7 files changed, 25 insertions(+), 7 deletions(-)
 delete mode 100644 src/test-services/.keys.development.example

diff --git a/.gitignore b/.gitignore
index 6806d9b..f9ab79b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,7 +8,6 @@ demo/validator*/.keys.staging
 src/deploy/deploy*/build/
 src/deploy/.keys.staging
 src/test-services/.keys.staging
-src/test-services/.keys.development
 src/test.js
 tests/results.xml
 package-lock.json
diff --git a/src/test-services/.keys.development.example b/src/test-services/.keys.development.example
deleted file mode 100644
index 6224ee0..0000000
--- a/src/test-services/.keys.development.example
+++ /dev/null
@@ -1 +0,0 @@
-FOREIGN_PRIVATE_KEY=0000000000000000000000000000000000000000000000000000000000000000
diff --git a/src/test-services/binanceBalance/run.sh b/src/test-services/binanceBalance/run.sh
index 72c66f2..35375b0 100755
--- a/src/test-services/binanceBalance/run.sh
+++ b/src/test-services/binanceBalance/run.sh
@@ -9,4 +9,8 @@ TARGET_NETWORK=${TARGET_NETWORK:=development}
 
 docker build -t binance-balance . > /dev/null
 
-docker run --rm --network binance_net --env-file ".env.$TARGET_NETWORK" binance-balance $@
+if [[ "$TARGET_NETWORK" == "development" ]]; then
+    docker run --rm --network binance_net --env-file ".env.$TARGET_NETWORK" binance-balance $@
+else
+    docker run --rm --env-file ".env.$TARGET_NETWORK" binance-balance $@
+fi
\ No newline at end of file
diff --git a/src/test-services/binanceSend/run.sh b/src/test-services/binanceSend/run.sh
index dbed1fa..908a2b4 100755
--- a/src/test-services/binanceSend/run.sh
+++ b/src/test-services/binanceSend/run.sh
@@ -9,4 +9,8 @@ TARGET_NETWORK=${TARGET_NETWORK:=development}
 
 docker build -t binance-send . > /dev/null
 
-docker run --rm --network binance_net --env-file ".env.$TARGET_NETWORK" --env-file "../.keys.$TARGET_NETWORK" -e "PRIVATE_KEY=$PRIVATE_KEY" binance-send $@
+if [[ "$TARGET_NETWORK" == "development" ]]; then
+    docker run --rm --network binance_net --env-file ".env.$TARGET_NETWORK" -e "PRIVATE_KEY=$PRIVATE_KEY" binance-send $@
+else
+    docker run --rm --env-file ".env.$TARGET_NETWORK" --env-file "../.keys.$TARGET_NETWORK" -e "PRIVATE_KEY=$PRIVATE_KEY" binance-send $@
+fi
diff --git a/src/test-services/ethereumBalance/run.sh b/src/test-services/ethereumBalance/run.sh
index 369a2b5..9dbef3f 100755
--- a/src/test-services/ethereumBalance/run.sh
+++ b/src/test-services/ethereumBalance/run.sh
@@ -9,4 +9,8 @@ TARGET_NETWORK=${TARGET_NETWORK:=development}
 
 docker build -t ethereum-balance . > /dev/null
 
-docker run --network blockchain_home --rm --env-file ".env.$TARGET_NETWORK" ethereum-balance $@
+if [[ "$TARGET_NETWORK" == "development" ]]; then
+    docker run --network blockchain_home --rm --env-file ".env.$TARGET_NETWORK" ethereum-balance $@
+else
+    docker run --rm --env-file ".env.$TARGET_NETWORK" ethereum-balance $@
+fi
diff --git a/src/test-services/ethereumSend/run.sh b/src/test-services/ethereumSend/run.sh
index 30d683e..3808257 100755
--- a/src/test-services/ethereumSend/run.sh
+++ b/src/test-services/ethereumSend/run.sh
@@ -9,4 +9,8 @@ TARGET_NETWORK=${TARGET_NETWORK:=development}
 
 docker build -t ethereum-send . > /dev/null
 
-docker run --network blockchain_home --rm --env-file ".env.$TARGET_NETWORK" --env-file "../.keys.$TARGET_NETWORK" -e "PRIVATE_KEY=$PRIVATE_KEY" ethereum-send $@
+if [[ "$TARGET_NETWORK" == "development" ]]; then
+    docker run --network blockchain_home --rm --env-file ".env.$TARGET_NETWORK" -e "PRIVATE_KEY=$PRIVATE_KEY" ethereum-send $@
+else
+    docker run --rm --env-file ".env.$TARGET_NETWORK" --env-file "../.keys.$TARGET_NETWORK" -e "PRIVATE_KEY=$PRIVATE_KEY" ethereum-send $@
+fi
diff --git a/src/test-services/sidePrefund/run.sh b/src/test-services/sidePrefund/run.sh
index 88df060..3955564 100755
--- a/src/test-services/sidePrefund/run.sh
+++ b/src/test-services/sidePrefund/run.sh
@@ -11,4 +11,8 @@ echo "Using $TARGET_NETWORK network"
 
 docker build -t side-prefund . > /dev/null
 
-docker run --network blockchain_side --rm --env-file ".env.$TARGET_NETWORK" --env-file "../.keys.$TARGET_NETWORK" side-prefund $@
+if [[ "$TARGET_NETWORK" == "development" ]]; then
+    docker run --network blockchain_side --rm --env-file ".env.$TARGET_NETWORK" side-prefund $@
+else
+    docker run --rm --env-file ".env.$TARGET_NETWORK" --env-file "../.keys.$TARGET_NETWORK" side-prefund $@
+fi