diff --git a/deployment/999_benchmark.js b/deployment/999_benchmark.js index a9b88778a..630b6f5fd 100644 --- a/deployment/999_benchmark.js +++ b/deployment/999_benchmark.js @@ -102,7 +102,7 @@ class Benchmark { this.accounts = this.signers.map((s) => s._address); this.config = config; - this.testManager = new TestManager(this.accounts); + this.testManager = new TestManager(); this.GuardianManagerWrapper = await this.deployer.wrapDeployedContract(GuardianManager, config.modules.GuardianManager); this.LockManagerWrapper = await this.deployer.wrapDeployedContract(LockManager, config.modules.LockManager); diff --git a/package-lock.json b/package-lock.json index f7f610e3f..e535dbd50 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1652,11 +1652,6 @@ "resolved": "https://registry.npmjs.org/address/-/address-1.1.2.tgz", "integrity": "sha512-aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA==" }, - "aes-js": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/aes-js/-/aes-js-3.1.2.tgz", - "integrity": "sha512-e5pEa2kBnBOgR4Y/p20pskXI74UEz7de8ZGVo58asOtvSVG5YAbJeELPZxOmt+Bnz3rX753YKhfIn4X4l1PPRQ==" - }, "aggregate-error": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz", @@ -2056,17 +2051,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.1.0.tgz", "integrity": "sha512-1Yj8h9Q+QDF5FzhMs/c9+6UntbD5MkRfRwac8DoEm9ZfUBZ7tZ55YcGVAzEe4bXsdQHEk+s9S5wsOKVdZrw0tQ==" }, - "bip39": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/bip39/-/bip39-3.0.2.tgz", - "integrity": "sha512-J4E1r2N0tUylTKt07ibXvhpT2c5pyAFgvuA5q1H9uDy6dEGpjV8jmymh3MTYJDLCNbIVClSB9FbND49I6N24MQ==", - "requires": { - "@types/node": "11.11.6", - "create-hash": "^1.1.0", - "pbkdf2": "^3.0.9", - "randombytes": "^2.0.1" - } - }, "bl": { "version": "1.2.2", "resolved": "https://registry.npmjs.org/bl/-/bl-1.2.2.tgz", @@ -4189,22 +4173,6 @@ } } }, - "ethereumjs-wallet": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/ethereumjs-wallet/-/ethereumjs-wallet-0.6.5.tgz", - "integrity": "sha512-MDwjwB9VQVnpp/Dc1XzA6J1a3wgHQ4hSvA1uWNatdpOrtCbPVuQSKSyRnjLvS0a+KKMw2pvQ9Ybqpb3+eW8oNA==", - "requires": { - "aes-js": "^3.1.1", - "bs58check": "^2.1.2", - "ethereum-cryptography": "^0.1.3", - "ethereumjs-util": "^6.0.0", - "randombytes": "^2.0.6", - "safe-buffer": "^5.1.2", - "scryptsy": "^1.2.1", - "utf8": "^3.0.0", - "uuid": "^3.3.2" - } - }, "etherlime-argent": { "version": "2.3.5", "resolved": "https://registry.npmjs.org/etherlime-argent/-/etherlime-argent-2.3.5.tgz", diff --git a/package.json b/package.json index 6c1df034b..e2217f6e5 100644 --- a/package.json +++ b/package.json @@ -63,13 +63,11 @@ "@uniswap/v2-core": "^1.0.1", "ajv": "^6.10.0", "aws-sdk": "^2.521.0", - "bip39": "^3.0.2", "bn-chai": "^1.0.1", "bn.js": "^5.1.1", "chai": "^4.2.0", "cli-table2": "^0.2.0", "dotenv": "^6.2.0", - "ethereumjs-wallet": "^0.6.3", "etherlime-argent": "2.3.5", "etherlime-lib": "1.1.3", "ethers": "^4.0.28", diff --git a/test/recoveryManager.js b/test/recoveryManager.js index a18df4c54..fa4c50707 100644 --- a/test/recoveryManager.js +++ b/test/recoveryManager.js @@ -22,7 +22,7 @@ const WRONG_SIGNATURE_NUMBER_REVERT_MSG = "RM: Wrong number of signatures"; const INVALID_SIGNATURES_REVERT_MSG = "RM: Invalid signatures"; contract("RecoveryManager", (accounts) => { - const manager = new TestManager(accounts); + const manager = new TestManager(); const owner = accounts[1].signer; const guardian1 = accounts[2].signer; diff --git a/utils/test-manager.js b/utils/test-manager.js index 23cd658ec..e804fed95 100644 --- a/utils/test-manager.js +++ b/utils/test-manager.js @@ -1,43 +1,15 @@ const etherlime = require("etherlime-lib"); const ethers = require("ethers"); const ps = require("ps-node"); -const hdkey = require("ethereumjs-wallet/hdkey"); -const bip39 = require("bip39"); const { signOffchain, bigNumberify, ETH_TOKEN } = require("./utilities.js"); -const USE_ETHERLIME_GANACHE_MNEMONIC = true; - -// this is the same mnemonic as that used by ganache-cli --deterministic -// this mnemonic will not be used if `USE_ETHERLIME_GANACHE_MNEMONIC` is set to `true` -const MNEMONIC = "myth like bonus scare over problem client lizard pioneer submit female collect"; - class TestManager { - constructor(_accounts = null, network = "ganache", deployer) { + constructor(network = "ganache", deployer) { this.network = network; - this.accounts = _accounts || this.loadAccounts(); - global.accounts = this.accounts; this.deployer = deployer || this.newDeployer(); this.provider = this.deployer.provider; } - loadAccounts() { // eslint-disable-line class-methods-use-this - if (USE_ETHERLIME_GANACHE_MNEMONIC) return global.accounts; - - // ignore (global) accounts loaded from cli-commands/ganache/setup.json - // and instead generate accounts matching those used by ganache-cli in determistic mode - const hdWallet = hdkey.fromMasterSeed(bip39.mnemonicToSeedSync(MNEMONIC)); - const localNodeProvider = new ethers.providers.JsonRpcProvider("http://localhost:8545"); - const accounts = []; - for (let i = 0; i < 10; i += 1) { - const privKey = hdWallet.derivePath(`m/44'/60'/0'/0/${i}`).getWallet().getPrivateKeyString(); - accounts.push({ - secretKey: privKey, - signer: new ethers.Wallet(privKey, localNodeProvider), - }); - } - return accounts; - } - newDeployer() { const defaultConfigs = { gasLimit: bigNumberify(20700000),