From 3614f8c2927448bd2a9f02409178a7e55eed81b5 Mon Sep 17 00:00:00 2001 From: Kirill Fedoseev Date: Mon, 11 Nov 2019 20:54:35 +0300 Subject: [PATCH] Fixed tests and demo scripts --- demo/start-binance-environment.sh | 4 ++-- tests/init.sh | 12 ++++++++---- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/demo/start-binance-environment.sh b/demo/start-binance-environment.sh index 2111c20..86ca927 100755 --- a/demo/start-binance-environment.sh +++ b/demo/start-binance-environment.sh @@ -16,10 +16,10 @@ docker volume rm binance-testnet_marketdata > /dev/null 2>&1 || true docker network create binance_net > /dev/null 2>&1 || true echo "Building required binaries" -docker build -t testnet-binaries . > /dev/null 2>&1 || true +docker build -t testnet-binaries ../src/binance-testnet > /dev/null 2>&1 || true echo "Running environment" -docker-compose up --build -d +docker-compose -f ../src/binance-testnet/docker-compose.yml up --build -d sleep 2 diff --git a/tests/init.sh b/tests/init.sh index cb4f279..b94a291 100755 --- a/tests/init.sh +++ b/tests/init.sh @@ -2,12 +2,16 @@ set -e -echo "Cleaning previous demo environment" -./demo/clean.sh - -echo "Killing all remaining validator docker containers" +echo "Killing all remaining docker containers" docker kill $(docker ps | grep validator[1-3]_ | awk '{print $1}') > /dev/null 2>&1 || true docker rm $(docker ps | grep validator[1-3]_ | awk '{print $1}') > /dev/null 2>&1 || true +docker kill ganache_home ganache_side > /dev/null 2>&1 || true +docker rm ganache_home ganache_side > /dev/null 2>&1 || true +docker kill $(docker ps | grep binance-testnet_ | awk '{print $1}') > /dev/null 2>&1 || true +docker rm $(docker ps | grep binance-testnet_ | awk '{print $1}') > /dev/null 2>&1 || true + +echo "Cleaning previous demo environment" +./demo/clean.sh echo "Building tss clients" docker build -t tss ./src/tss