removed openzeppelin test-helper which was causing problems on e2e tests

mysteriumnetwork · Oct 8, 2021 · 673e8f2 · 673e8f2
1 parent 49b89c6
commit 673e8f2
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 47,132 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,2 +1,4 @@
 node_modules
 build
+
+package-lock.json
diff --git a/migrations/1_initial_migration.js b/migrations/1_initial_migration.js
@@ -5,7 +5,6 @@ const uniswap = require("../scripts/deployUniswap")
 const WETH = require("../scripts/deployWETH")
 
 const deployRegistry = require("../scripts/deployRegistry")
-const { web3 } = require("@openzeppelin/test-helpers/src/setup")
 
 module.exports = async function (deployer, network, accounts) {
     if (network === 'mumbai' || network === 'goerli') {

diff --git a/migrations/2_deploy_contracts.js b/migrations/2_deploy_contracts.js
@@ -1,4 +1,4 @@
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 
 const MystToken = artifacts.require("MystToken")
 const Registry = artifacts.require("Registry")

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,6 @@
         "@ethersproject/providers": "^5.3.0",
         "@ethersproject/solidity": "^5.3.0",
         "@openzeppelin/contracts": "4.1.0",
-        "@openzeppelin/test-helpers": "^0.5.11",
         "@truffle/hdwallet-provider": "1.2.6",
         "chai": "^4.3.4",
         "chai-as-promised": "^7.1.1",
@@ -39,6 +38,7 @@
         "lodash": "^4.17.21",
         "secp256k1": "^4.0.2",
         "truffle": "^5.4.13",
-        "truffle-flattener": "^1.5.0"
+        "truffle-flattener": "^1.5.0",
+        "web3-utils": "^1.6.0"
     }
 }
diff --git a/test/beneficiary.js b/test/beneficiary.js
@@ -3,7 +3,7 @@
     Tested functions can be found in smart-contract code at `contracts/HermesImplementation.sol`.
 */
 
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     generateChannelId,
     topUpTokens,

diff --git a/test/channel.js b/test/channel.js
@@ -3,7 +3,7 @@
     Smart-contract code can be found in `contracts/ChannelImplementation.sol`.
 */
 
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     topUpTokens,
     topUpEthers,

diff --git a/test/fastWithdrawal.js b/test/fastWithdrawal.js
@@ -3,7 +3,7 @@
     Smart-contract code can be found in `contracts/ChannelImplementation.sol`.
 */
 
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     topUpTokens,
     topUpEthers,

diff --git a/test/fundsRecovery.js b/test/fundsRecovery.js
@@ -1,4 +1,4 @@
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     deriveContractAddress,
     topUpEthers,

diff --git a/test/fundsRecoveryByCheque.js b/test/fundsRecoveryByCheque.js
@@ -1,4 +1,4 @@
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     genCreate2Address,
     signMessage,

diff --git a/test/greenpaths.js b/test/greenpaths.js
@@ -3,7 +3,7 @@
     on-chain and off-chain interactions from registering identity, to settlement of received funds
 */
 
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     topUpTokens,
     topUpEthers,

diff --git a/test/hermes.js b/test/hermes.js
@@ -3,7 +3,7 @@
     Smart-contract code can be found in `contracts/HermesImplementation.sol`.
 */
 
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     generateChannelId,
     topUpTokens,

diff --git a/test/hermesChannelSettlement.js b/test/hermesChannelSettlement.js
@@ -3,8 +3,9 @@
     Tested functions can be found in smart-contract code at `contracts/HermesImplementation.sol`.
 */
 
-const { BN } = require('@openzeppelin/test-helpers')
-const { randomBytes } = require('crypto')
+// const {BN} = require('web3-utils')
+const {BN} = require('web3-utils');
+// const { randomBytes } = require('crypto')
 const {
     generateChannelId,
     topUpTokens,

diff --git a/test/hermesClosing.js b/test/hermesClosing.js
@@ -1,7 +1,7 @@
 require('chai')
     .use(require('chai-as-promised'))
     .should()
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 
 const { topUpTokens, setupDEX } = require('./utils/index.js')
 const {

diff --git a/test/hermesFee.js b/test/hermesFee.js
@@ -1,7 +1,7 @@
 require('chai')
     .use(require('chai-as-promised'))
     .should()
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const { randomBytes } = require('crypto')
 const { topUpTokens, generateChannelId, keccak, setupDEX } = require('./utils/index.js')
 const {

diff --git a/test/hermesPayAndSettle.js b/test/hermesPayAndSettle.js
@@ -1,4 +1,4 @@
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const chai = require('chai')
 chai.use(require('chai-as-promised'))
 chai.use(require('chai-bn')(BN))

diff --git a/test/hermesStakeAndPunishment.js b/test/hermesStakeAndPunishment.js
@@ -1,7 +1,7 @@
 require('chai')
     .use(require('chai-as-promised'))
     .should()
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const { randomBytes } = require('crypto')
 
 const { topUpTokens, setupDEX, generateChannelId, keccak } = require('./utils/index.js')

diff --git a/test/multiHermes.js b/test/multiHermes.js
@@ -1,7 +1,7 @@
 require('chai')
     .use(require('chai-as-promised'))
     .should()
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const { topUpTokens, setupDEX } = require('./utils/index.js')
 const { signIdentityRegistration } = require('./utils/client.js')
 const wallet = require('./utils/wallet.js')

diff --git a/test/registry.js b/test/registry.js
@@ -1,7 +1,7 @@
 require('chai')
     .use(require('chai-as-promised'))
     .should()
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 
 const genCreate2Address = require('./utils/index.js').genCreate2Address
 const topUpTokens = require('./utils/index.js').topUpTokens

diff --git a/test/utils/wallet.js b/test/utils/wallet.js
@@ -1,5 +1,5 @@
 const EthereumTx = require('ethereumjs-tx')
-const { BN } = require('@openzeppelin/test-helpers')
+const {BN} = require('web3-utils')
 const {
     generatePrivateKey,
     privateToPublic,