From dc7ff355071bd469f39d71999ce5af7a16710663 Mon Sep 17 00:00:00 2001
From: Ben Burns <803016+benjamincburns@users.noreply.github.com>
Date: Wed, 6 May 2020 16:19:55 -0700
Subject: [PATCH] fix up integration tests

Signed-off-by: Ben Burns <803016+benjamincburns@users.noreply.github.com>
---
 .../besu_tests/phase1/networkconfig.json                      | 4 ++--
 .../besu_tests/phase2/networkconfig.json                      | 4 ++--
 .../besu_tests/phase3/networkconfig.json                      | 4 ++--
 .../ethereum_tests/config/caliper-ethereum-clique.Dockerfile  | 2 +-
 .../ethereum_tests/config/docker-compose.yml                  | 2 +-
 .../ethereum_tests/networkconfig.json                         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/caliper-tests-integration/besu_tests/phase1/networkconfig.json b/packages/caliper-tests-integration/besu_tests/phase1/networkconfig.json
index c24c023d1d..68da84c580 100644
--- a/packages/caliper-tests-integration/besu_tests/phase1/networkconfig.json
+++ b/packages/caliper-tests-integration/besu_tests/phase1/networkconfig.json
@@ -7,7 +7,7 @@
           }
     },
     "ethereum": {
-        "url": "http://localhost:8545",
+        "url": "ws://localhost:8546",
         "contractDeployerAddress": "0xD1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09",
         "contractDeployerAddressPrivateKey": "0x797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b",
         "fromAddressSeed": "0x3f841bf589fdf83a521e55d51afddc34fa65351161eead24f064855fc29c9580",
@@ -23,4 +23,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/caliper-tests-integration/besu_tests/phase2/networkconfig.json b/packages/caliper-tests-integration/besu_tests/phase2/networkconfig.json
index ef7455ba9c..2c80e4655a 100644
--- a/packages/caliper-tests-integration/besu_tests/phase2/networkconfig.json
+++ b/packages/caliper-tests-integration/besu_tests/phase2/networkconfig.json
@@ -7,7 +7,7 @@
           }
     },
     "ethereum": {
-        "url": "http://localhost:8545",
+        "url": "ws://localhost:8546",
         "contractDeployerAddress": "0xD1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09",
         "contractDeployerAddressPrivateKey": "0x797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b",
         "fromAddressSeed": "0x3f841bf589fdf83a521e55d51afddc34fa65351161eead24f064855fc29c9580",
@@ -23,4 +23,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/caliper-tests-integration/besu_tests/phase3/networkconfig.json b/packages/caliper-tests-integration/besu_tests/phase3/networkconfig.json
index c24c023d1d..68da84c580 100644
--- a/packages/caliper-tests-integration/besu_tests/phase3/networkconfig.json
+++ b/packages/caliper-tests-integration/besu_tests/phase3/networkconfig.json
@@ -7,7 +7,7 @@
           }
     },
     "ethereum": {
-        "url": "http://localhost:8545",
+        "url": "ws://localhost:8546",
         "contractDeployerAddress": "0xD1cf9D73a91DE6630c2bb068Ba5fDdF9F0DEac09",
         "contractDeployerAddressPrivateKey": "0x797c13f7235c627f6bd013dc17fff4c12213ab49abcf091f77c83f16db10e90b",
         "fromAddressSeed": "0x3f841bf589fdf83a521e55d51afddc34fa65351161eead24f064855fc29c9580",
@@ -23,4 +23,4 @@
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/packages/caliper-tests-integration/ethereum_tests/config/caliper-ethereum-clique.Dockerfile b/packages/caliper-tests-integration/ethereum_tests/config/caliper-ethereum-clique.Dockerfile
index 8de21e6c48..7722945405 100644
--- a/packages/caliper-tests-integration/ethereum_tests/config/caliper-ethereum-clique.Dockerfile
+++ b/packages/caliper-tests-integration/ethereum_tests/config/caliper-ethereum-clique.Dockerfile
@@ -15,5 +15,5 @@
 FROM ethereum/client-go:stable
 COPY ./data/ /root/
 VOLUME [ "/root/.ethereum/keystore/" ]
-RUN geth --nousb init /root/genesis.json && geth --nousb import /root/bc.dat
+RUN geth --nousb init /root/genesis.json && geth --ws --wsorigins '*' --nousb import /root/bc.dat
 ENTRYPOINT [ "geth" ]
diff --git a/packages/caliper-tests-integration/ethereum_tests/config/docker-compose.yml b/packages/caliper-tests-integration/ethereum_tests/config/docker-compose.yml
index 7c27bb63b7..9810b10f9e 100644
--- a/packages/caliper-tests-integration/ethereum_tests/config/docker-compose.yml
+++ b/packages/caliper-tests-integration/ethereum_tests/config/docker-compose.yml
@@ -23,5 +23,5 @@ services:
     volumes:
       - ./keys:/root/.ethereum/keystore
     ports:
-      - 8545:8545
+      - 8546:8546
     command: --unlock 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --password /root/.ethereum/keystore/password --mine --minerthreads 2 --etherbase 0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2 --rpc --rpcaddr 0.0.0.0 --rpcvhosts=* --rpcapi admin,eth,miner,personal,web3 --allow-insecure-unlock --nodiscover --gasprice 1
diff --git a/packages/caliper-tests-integration/ethereum_tests/networkconfig.json b/packages/caliper-tests-integration/ethereum_tests/networkconfig.json
index e35cc04ce6..2ae91ac546 100644
--- a/packages/caliper-tests-integration/ethereum_tests/networkconfig.json
+++ b/packages/caliper-tests-integration/ethereum_tests/networkconfig.json
@@ -7,7 +7,7 @@
           }
     },
     "ethereum": {
-        "url": "http://localhost:8545",
+        "url": "ws://localhost:8546",
         "contractDeployerAddress": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2",
         "contractDeployerAddressPassword": "password",
         "fromAddress": "0xc0A8e4D217eB85b812aeb1226fAb6F588943C2C2",