From 85a4a27872789aca716d60debe5a3ed0555a84c3 Mon Sep 17 00:00:00 2001
From: rzadp <przemek@ethworks.io>
Date: Tue, 21 May 2019 09:27:01 +0200
Subject: [PATCH] oracle-e2e uses main dockerfile and main contracts submodule.

---
 oracle-e2e/Dockerfile         | 28 ----------------------------
 oracle-e2e/deploy.js          |  2 +-
 oracle-e2e/docker-compose.yml |  2 +-
 oracle-e2e/run-tests.sh       |  4 ++--
 4 files changed, 4 insertions(+), 32 deletions(-)
 delete mode 100644 oracle-e2e/Dockerfile

diff --git a/oracle-e2e/Dockerfile b/oracle-e2e/Dockerfile
deleted file mode 100644
index ef58cdbd..00000000
--- a/oracle-e2e/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-FROM node:8
-
-RUN mkdir /stuff
-WORKDIR /stuff
-
-COPY package.json .
-COPY package-lock.json .
-
-RUN git clone https://github.com/poanetwork/poa-bridge-contracts.git
-
-RUN mkdir submodules && \
-  mv poa-bridge-contracts submodules && \
-  cd submodules/poa-bridge-contracts && \
-  git fetch && \
-  git checkout 2.2.0
-
-RUN npm install --unsafe-perm
-
-RUN cd submodules/poa-bridge-contracts && \
-  npm install && \
-  ./node_modules/.bin/truffle compile && \
-  cd deploy && \
-  npm install
-
-ADD . .
-
-
-CMD ["npm", "start"]
diff --git a/oracle-e2e/deploy.js b/oracle-e2e/deploy.js
index 90ff828f..325103d4 100644
--- a/oracle-e2e/deploy.js
+++ b/oracle-e2e/deploy.js
@@ -2,7 +2,7 @@ const path = require('path')
 const shell = require('shelljs')
 
 const envsDir = path.join(__dirname, 'envs')
-const deployContractsDir = path.join(__dirname, 'submodules/poa-bridge-contracts/deploy')
+const deployContractsDir = path.join(__dirname, '../contracts/deploy')
 const erc20ScriptDir = path.join(__dirname, 'scripts')
 
 shell.cp(path.join(envsDir, 'contracts-deploy.env'), path.join(deployContractsDir, '.env'))
diff --git a/oracle-e2e/docker-compose.yml b/oracle-e2e/docker-compose.yml
index 9082912f..8d42ffd2 100644
--- a/oracle-e2e/docker-compose.yml
+++ b/oracle-e2e/docker-compose.yml
@@ -98,5 +98,5 @@ services:
       - ALLOW_HTTP=yes
     command: "true"
   e2e:
-    build: .
+    build: ../
     command: "true"
diff --git a/oracle-e2e/run-tests.sh b/oracle-e2e/run-tests.sh
index 49ccdf11..4c4daa45 100755
--- a/oracle-e2e/run-tests.sh
+++ b/oracle-e2e/run-tests.sh
@@ -1,7 +1,7 @@
 cd $(dirname $0)
 
 docker-compose up -d --build --force-recreate
-docker-compose run e2e npm run deploy
+docker-compose run e2e yarn workspace oracle-e2e run deploy
 docker-compose run -d bridge npm run watcher:signature-request
 docker-compose run -d bridge npm run watcher:collected-signatures
 docker-compose run -d bridge npm run watcher:affirmation-request
@@ -13,7 +13,7 @@ docker-compose run -d bridge-erc-native npm run watcher:collected-signatures
 docker-compose run -d bridge-erc-native npm run watcher:affirmation-request
 docker-compose run -d bridge npm run sender:home
 docker-compose run -d bridge npm run sender:foreign
-docker-compose run e2e npm start
+docker-compose run e2e yarn workspace oracle-e2e run start
 
 rc=$?
 docker-compose down