From 13d49de5c664a2e23fd6933493f5429dfc14ce55 Mon Sep 17 00:00:00 2001 From: rzadp Date: Tue, 4 Jun 2019 10:51:34 +0200 Subject: [PATCH] Moved constant user from oracle-e2e to e2e-common --- e2e-commons/README.md | 5 +++++ e2e-commons/constants.json | 6 ++++++ e2e-commons/scripts/blocks.js | 11 +++++------ e2e-commons/scripts/deployERC20.js | 4 ++-- oracle-e2e/constants.json | 4 ---- oracle-e2e/test/ercToErc.js | 3 ++- oracle-e2e/test/ercToNative.js | 3 ++- oracle-e2e/test/nativeToErc.js | 3 ++- 8 files changed, 24 insertions(+), 15 deletions(-) create mode 100644 e2e-commons/constants.json diff --git a/e2e-commons/README.md b/e2e-commons/README.md index 8a3af6b2..58f63d32 100644 --- a/e2e-commons/README.md +++ b/e2e-commons/README.md @@ -9,6 +9,11 @@ Common scripts and configuration for the end-to-end tests. ``` Spins up parity networks, redis, rabbit, e2e container needed for end-to-end tests. +``` +./down.sh +``` +Shuts down and cleans up containers, networks, services, running scripts. + ### Components | Component | Description | diff --git a/e2e-commons/constants.json b/e2e-commons/constants.json new file mode 100644 index 00000000..b4669908 --- /dev/null +++ b/e2e-commons/constants.json @@ -0,0 +1,6 @@ +{ + "user": { + "address": "0x7FC1442AB55Da569940Eb750AaD2BAA63DA4010E", + "privateKey": "0x460635eb4ac4287de2d2393985e19b4a9f948ac533453a1044ab8d50330b0df9" + } +} diff --git a/e2e-commons/scripts/blocks.js b/e2e-commons/scripts/blocks.js index 1fad990a..2e136f6b 100644 --- a/e2e-commons/scripts/blocks.js +++ b/e2e-commons/scripts/blocks.js @@ -3,15 +3,14 @@ const { generateNewBlock } = require('../utils') const homeWeb3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8541')) const foreignWeb3 = new Web3(new Web3.providers.HttpProvider('http://localhost:8542')) -const account = '0x7FC1442AB55Da569940Eb750AaD2BAA63DA4010E' -const privateKey = '0x460635eb4ac4287de2d2393985e19b4a9f948ac533453a1044ab8d50330b0df9' -homeWeb3.eth.accounts.wallet.add(privateKey) -foreignWeb3.eth.accounts.wallet.add(privateKey) +const {user} = require('../constants.json'); +homeWeb3.eth.accounts.wallet.add(user.privateKey) +foreignWeb3.eth.accounts.wallet.add(user.privateKey) function main() { setTimeout(async () => { - generateNewBlock(homeWeb3, account) - generateNewBlock(foreignWeb3, account) + generateNewBlock(homeWeb3, user.account) + generateNewBlock(foreignWeb3, user.account) main() }, 5000) } diff --git a/e2e-commons/scripts/deployERC20.js b/e2e-commons/scripts/deployERC20.js index 25eeaae4..4526f36c 100644 --- a/e2e-commons/scripts/deployERC20.js +++ b/e2e-commons/scripts/deployERC20.js @@ -1,10 +1,10 @@ /* eslint import/no-unresolved: 0 node/no-missing-require: 0 */ const path = require('path') +const {user} = require('../constants.json') const contractsPath = '../../contracts'; require('dotenv').config({ path: path.join(__dirname, contractsPath, '/deploy/.env') }) -const user = '0x7FC1442AB55Da569940Eb750AaD2BAA63DA4010E' const { deployContract, @@ -33,7 +33,7 @@ async function deployErc20() { console.log('[Foreign] POA20 Test: ', poa20foreign.options.address) const mintData = await poa20foreign.methods - .mint(user, '500000000000000000000') + .mint(user.address, '500000000000000000000') .encodeABI({ from: DEPLOYMENT_ACCOUNT_ADDRESS }) await sendRawTxForeign({ data: mintData, diff --git a/oracle-e2e/constants.json b/oracle-e2e/constants.json index b9a6f46b..3758e820 100644 --- a/oracle-e2e/constants.json +++ b/oracle-e2e/constants.json @@ -3,10 +3,6 @@ "address": "0xcca2fb44C8C36E51f743269d6F484Fd027B9F9Aa", "privateKey": "0xcf954e07e6a439faf392eb474e95ddb444c2ca444847f2ad6ecc79e1a585e2b8" }, - "user": { - "address": "0x7FC1442AB55Da569940Eb750AaD2BAA63DA4010E", - "privateKey": "0x460635eb4ac4287de2d2393985e19b4a9f948ac533453a1044ab8d50330b0df9" - }, "validator": { "address": "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b", "privateKey": "0x8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9" diff --git a/oracle-e2e/test/ercToErc.js b/oracle-e2e/test/ercToErc.js index 8320b1f1..f7f3b8fd 100644 --- a/oracle-e2e/test/ercToErc.js +++ b/oracle-e2e/test/ercToErc.js @@ -2,7 +2,8 @@ const path = require('path') const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, contractsPath } = require('../constants.json') +const { user } = require('../../e2e-commons/constants.json') +const { contractsPath } = require('../constants.json') const { generateNewBlock } = require('../../e2e-commons/utils') const abisDir = path.join(__dirname, '..', contractsPath, 'build/contracts') diff --git a/oracle-e2e/test/ercToNative.js b/oracle-e2e/test/ercToNative.js index 2e4263fb..56d5953b 100644 --- a/oracle-e2e/test/ercToNative.js +++ b/oracle-e2e/test/ercToNative.js @@ -2,7 +2,8 @@ const path = require('path') const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, contractsPath } = require('../constants.json') +const { user } = require('../../e2e-commons/constants.json') +const { contractsPath } = require('../constants.json') const { generateNewBlock } = require('../../e2e-commons/utils') const abisDir = path.join(__dirname, '..', contractsPath, 'build/contracts') diff --git a/oracle-e2e/test/nativeToErc.js b/oracle-e2e/test/nativeToErc.js index 4e1ebfe1..e5db3f7d 100644 --- a/oracle-e2e/test/nativeToErc.js +++ b/oracle-e2e/test/nativeToErc.js @@ -2,7 +2,8 @@ const path = require('path') const Web3 = require('web3') const assert = require('assert') const promiseRetry = require('promise-retry') -const { user, validator, temp, contractsPath } = require('../constants.json') +const { user } = require('../../e2e-commons/constants.json') +const { validator, temp, contractsPath } = require('../constants.json') const { generateNewBlock } = require('../../e2e-commons/utils') const abisDir = path.join(__dirname, '..', contractsPath, '/build/contracts')