diff --git a/e2e-commons/constants.json b/e2e-commons/constants.json index 1a549cb6..3cb17bb0 100644 --- a/e2e-commons/constants.json +++ b/e2e-commons/constants.json @@ -26,5 +26,7 @@ "home": "0x32198D570fffC7033641F8A9094FFDCaAEF42624", "foreign": "0x2B6871b9B02F73fa24F4864322CdC78604207769", "foreignToken": "0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B" - } + }, + "homeRPCURL": "http://parity1:8545", + "foreignRPCURL": "http://parity2:8545" } diff --git a/oracle-e2e/config.json b/oracle-e2e/config.json index e4243af2..92205aca 100644 --- a/oracle-e2e/config.json +++ b/oracle-e2e/config.json @@ -1,5 +1,3 @@ { - "contractsPath": "../contracts", - "homeRPC": "http://parity1:8545", - "foreignRPC": "http://parity2:8545" + "contractsPath": "../contracts" } diff --git a/oracle-e2e/test/ercToErc.js b/oracle-e2e/test/ercToErc.js index 80e60321..40129fa1 100644 --- a/oracle-e2e/test/ercToErc.js +++ b/oracle-e2e/test/ercToErc.js @@ -2,14 +2,14 @@ const path = require('path') const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, ercToErcBridge } = require('../../e2e-commons/constants.json') -const { contractsPath, homeRPC, foreignRPC } = require('../config.json') +const { user, ercToErcBridge, homeRPCURL, foreignRPCURL } = require('../../e2e-commons/constants.json') +const { contractsPath } = require('../config.json') const { generateNewBlock } = require('../../e2e-commons/utils') const abisDir = path.join(__dirname, '..', contractsPath, 'build/contracts') -const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPC)) -const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPC)) +const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPCURL)) +const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPCURL)) const HOME_BRIDGE_ADDRESS = ercToErcBridge.home const FOREIGN_BRIDGE_ADDRESS = ercToErcBridge.foreign diff --git a/oracle-e2e/test/ercToNative.js b/oracle-e2e/test/ercToNative.js index d655eebc..298b198b 100644 --- a/oracle-e2e/test/ercToNative.js +++ b/oracle-e2e/test/ercToNative.js @@ -2,14 +2,14 @@ const path = require('path') const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, ercToNativeBridge } = require('../../e2e-commons/constants.json') -const { contractsPath, homeRPC, foreignRPC } = require('../config.json') +const { user, ercToNativeBridge, homeRPCURL, foreignRPCURL } = require('../../e2e-commons/constants.json') +const { contractsPath } = require('../config.json') const { generateNewBlock } = require('../../e2e-commons/utils') const abisDir = path.join(__dirname, '..', contractsPath, 'build/contracts') -const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPC)) -const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPC)) +const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPCURL)) +const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPCURL)) const HOME_BRIDGE_ADDRESS = ercToNativeBridge.home const FOREIGN_BRIDGE_ADDRESS = ercToNativeBridge.foreign diff --git a/oracle-e2e/test/nativeToErc.js b/oracle-e2e/test/nativeToErc.js index 81d1311b..a1527dce 100644 --- a/oracle-e2e/test/nativeToErc.js +++ b/oracle-e2e/test/nativeToErc.js @@ -2,14 +2,14 @@ const path = require('path') const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, validator, nativeToErcBridge, secondUser } = require('../../e2e-commons/constants.json') -const { contractsPath, homeRPC, foreignRPC } = require('../config.json') +const { user, validator, nativeToErcBridge, secondUser, homeRPCURL, foreignRPCURL } = require('../../e2e-commons/constants.json') +const { contractsPath } = require('../config.json') const { generateNewBlock } = require('../../e2e-commons/utils') const abisDir = path.join(__dirname, '..', contractsPath, '/build/contracts') -const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPC)) -const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPC)) +const homeWeb3 = new Web3(new Web3.providers.HttpProvider(homeRPCURL)) +const foreignWeb3 = new Web3(new Web3.providers.HttpProvider(foreignRPCURL)) const HOME_BRIDGE_ADDRESS = nativeToErcBridge.home const FOREIGN_BRIDGE_ADDRESS = nativeToErcBridge.foreign