From c3d2d3b7cef4b06f36395606f6f43c3271351299 Mon Sep 17 00:00:00 2001
From: David Ruiz <druiz0992@gmail.com>
Date: Wed, 26 Jan 2022 17:35:15 +0100
Subject: [PATCH] fix: updated RETRIES to delpoy contracts in client, and
 increase wallet tx test times

---
 docker-compose.yml     |  1 +
 wallet/docker-entry.sh | 34 ++++++++++++++++++++++------------
 wallet/test/tx_test.py |  2 +-
 3 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 0c9204bbd..0f1ec2018 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,6 +44,7 @@ services:
       OPTIMIST_HOST: optimist1
       OPTIMIST_PORT: 80
       USE_STUBS: 'false' # make sure this flag is the same as in deployer service
+      RETRIES: 80
     command: ['npm', 'run', 'dev']
 
   client2:
diff --git a/wallet/docker-entry.sh b/wallet/docker-entry.sh
index 943770d80..0e495b514 100644
--- a/wallet/docker-entry.sh
+++ b/wallet/docker-entry.sh
@@ -22,9 +22,13 @@ main() {
     if [ ${RUN_SELENIUM_TESTS} -eq 1 ]; then
       wait_ready
       tmux select-pane -t 1
-      tmux send-keys "node  ../cli/src/proposer.mjs --environment Docker" Enter
+      sudo touch test/.proposer_log
+      sudo chown apps test/.proposer_log
+      sudo touch test/.liquidity-provider_log
+      sudo chown apps test/.liquidity-provider_log
+      tmux send-keys "node  ../cli/src/proposer.mjs --environment Docker | tee test/.proposer_log" Enter
       tmux select-pane -t 2
-      tmux send-keys "node ../cli/src/liquidity-provider.mjs --environment Docker" Enter 
+      tmux send-keys "node ../cli/src/liquidity-provider.mjs --environment Docker | tee test/.liquidity-provider_log" Enter 
       tmux select-pane -t 3
       sudo touch test/.test_results
       sudo chown apps test/.test_results
@@ -50,6 +54,8 @@ wait_tests_done() {
      fi
      sleep 10
    done
+   cat test/.proposer_log
+   cat test/.liquidity-provider_log
    cat test/.test_results
    testResults=$(cat test/.test_results | grep FAILED)
    if [ -z "${testResults}" ]; then
@@ -68,17 +74,21 @@ wait_ready() {
     app_deployed=$(curl http://wallet-test:3010 2> /dev/null | grep favicon)
   done
   echo "Wallet deployed"
-  sleep 60
-  #wscommand='{"jsonrpc":  "2.0", "id": 0, "method":  "eth_blockNumber"}'
-  #block=0
-  #while [ ! -z "${block}" ] && [ "${block}" -lt 36 ]; do
+  wscommand='{"jsonrpc":  "2.0", "id": 0, "method":  "eth_blockNumber"}'
+  block=0
+  while [ ! -z "${block}" ] && [ "${block}" -lt 300 ]; do
+    res=$(curl --location --request POST 'http://blockchain1:8546' --header 'Content-Type: application/json' --data-raw '{
+	"jsonrpc":"2.0",
+	"method":"eth_blockNumber",
+	"id":1
+    }')
     #res=$(wscat -c 'ws://blockchain1:8546' -w 1 -x "${wscommand}" | grep result)
-    #echo "RES ${res}"
-    #blockHex=$(echo ${res} | awk '{split($0,a,":"); print a[4]}' | tr -d '"' | tr -d '}' | tr -d '0x')	
-    #echo "Busy ${wscommand} ${blockHex} ${block}"
-    #block=$(printf $((16#${blockHex})))
-    #sleep 10
-  #done
+    echo "RES ${res}"
+    blockHex=$(echo ${res} | awk '{split($0,a,":"); print a[4]}' | tr -d '"' | tr -d '}' | tr -d '0x')	
+    block=$(printf $((16#${blockHex})))
+    echo "Busy ${blockHex} ${block}"
+    sleep 10
+  done
   echo "Contracts deployed"
 }
 
diff --git a/wallet/test/tx_test.py b/wallet/test/tx_test.py
index 9bad47ae7..72113b1af 100644
--- a/wallet/test/tx_test.py
+++ b/wallet/test/tx_test.py
@@ -110,7 +110,7 @@ def waitBalanceChange(l1Balance, l2Balance, txParams, nTx, findElementsInstance)
     "tokenAddress": tokens['erc20'],
   }
   while True:
-    sleep(5)
+    sleep(10)
     tokenRefresh(txTestParams,findElementsInstance)
     if niter == 15:
       errorMsg = "FAILED - waited too long\n"