Update contract's submodule and e2e tests (#313)

omni · Apr 24, 2020 · 64c5a56 · 64c5a56
1 parent c8c5895
commit 64c5a56
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 312 deletions.
diff --git a/contracts b/contracts
diff --git a/e2e-commons/contracts-envs/erc-to-native.env b/e2e-commons/contracts-envs/erc-to-native.env
@@ -32,7 +32,7 @@ FOREIGN_GAS_PRICE=10000000000
 FOREIGN_REWARDABLE=false
 
 BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977
-ERC20_TOKEN_ADDRESS=0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359
+ERC20_TOKEN_ADDRESS=0x7cc4b1851c35959d34e635a470f6b5c43ba3c9c9
 
 REQUIRED_NUMBER_OF_VALIDATORS=1
 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d"
diff --git a/monitor-e2e/test/ercToNative.js b/monitor-e2e/test/ercToNative.js
@@ -7,8 +7,7 @@ const {
   addValidator,
   initializeChaiToken,
   convertDaiToChai,
-  setMinDaiTokenBalance,
-  migrateToMCD
+  setMinDaiTokenBalance
 } = require('../utils')
 
 const baseUrl = ercToNativeBridge.monitor
@@ -34,43 +33,12 @@ describe('ERC TO NATIVE with changing state of contracts', () => {
 
   it('should change balanceDiff', async function() {
     this.timeout(60000)
-    await sendTokens(foreignRPC.URL, user, ercToNativeBridge.halfDuplexToken, ercToNativeBridge.foreign)
-
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}`))
-      const { erc20Balance, halfDuplexErc20Balance, investedErc20Balance } = data.foreign
-      return (
-        data.balanceDiff === 0.01 &&
-        erc20Balance === '0.01' &&
-        halfDuplexErc20Balance === undefined &&
-        investedErc20Balance === undefined
-      )
-    })
-
-    await migrateToMCD(foreignRPC.URL, ercToNativeBridge.foreign)
-
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}`))
-      const { erc20Balance, halfDuplexErc20Balance, investedErc20Balance } = data.foreign
-      return (
-        data.balanceDiff === 0.01 &&
-        erc20Balance === '0.01' &&
-        halfDuplexErc20Balance === '0' &&
-        investedErc20Balance === undefined
-      )
-    })
-
-    await sendTokens(foreignRPC.URL, user, ercToNativeBridge.halfDuplexToken, ercToNativeBridge.foreign)
+    await sendTokens(foreignRPC.URL, user, ercToNativeBridge.foreignToken, ercToNativeBridge.foreign)
 
     await waitUntil(async () => {
       ;({ data } = await axios.get(`${baseUrl}`))
-      const { erc20Balance, halfDuplexErc20Balance, investedErc20Balance } = data.foreign
-      return (
-        data.balanceDiff === 0.02 &&
-        erc20Balance === '0.01' &&
-        halfDuplexErc20Balance === '0.01' &&
-        investedErc20Balance === undefined
-      )
+      const { erc20Balance, investedErc20Balance } = data.foreign
+      return data.balanceDiff === 0.01 && erc20Balance === '0.01' && investedErc20Balance === undefined
     })
   })
 
@@ -89,11 +57,10 @@ describe('ERC TO NATIVE with changing state of contracts', () => {
 
     await waitUntil(async () => {
       ;({ data } = await axios.get(`${baseUrl}`))
-      const { erc20Balance, halfDuplexErc20Balance, investedErc20Balance, accumulatedInterest } = data.foreign
+      const { erc20Balance, investedErc20Balance, accumulatedInterest } = data.foreign
       return (
-        data.balanceDiff === 0.03 &&
+        data.balanceDiff === 0.02 &&
         erc20Balance === '0.02' &&
-        halfDuplexErc20Balance === '0.01' &&
         investedErc20Balance === '0' &&
         accumulatedInterest === '0.001' // value of dsrBalance() is initially defined in genesis block as 0.001
       )
@@ -104,11 +71,10 @@ describe('ERC TO NATIVE with changing state of contracts', () => {
 
     await waitUntil(async () => {
       ;({ data } = await axios.get(`${baseUrl}`))
-      const { erc20Balance, halfDuplexErc20Balance, investedErc20Balance, accumulatedInterest } = data.foreign
+      const { erc20Balance, investedErc20Balance, accumulatedInterest } = data.foreign
       return (
-        data.balanceDiff === 0.03 &&
+        data.balanceDiff === 0.02 &&
         erc20Balance === '0.01' &&
-        halfDuplexErc20Balance === '0.01' &&
         investedErc20Balance === '0.01' &&
         accumulatedInterest === '0.001'
       )
@@ -119,11 +85,10 @@ describe('ERC TO NATIVE with changing state of contracts', () => {
 
     await waitUntil(async () => {
       ;({ data } = await axios.get(`${baseUrl}`))
-      const { erc20Balance, halfDuplexErc20Balance, investedErc20Balance, accumulatedInterest } = data.foreign
+      const { erc20Balance, investedErc20Balance, accumulatedInterest } = data.foreign
       return (
-        data.balanceDiff === 0.03 &&
+        data.balanceDiff === 0.02 &&
         erc20Balance === '0.005' &&
-        halfDuplexErc20Balance === '0.01' &&
         investedErc20Balance === '0.015' &&
         accumulatedInterest === '0.001'
       )

diff --git a/monitor-e2e/utils.js b/monitor-e2e/utils.js
@@ -67,16 +67,6 @@ const addValidator = async (rpcUrl, account, bridgeAddress) => {
   })
 }
 
-const migrateToMCD = async (rpcUrl, bridgeAddress) => {
-  const web3 = new Web3(new Web3.providers.HttpProvider(rpcUrl))
-  web3.eth.accounts.wallet.add(validator.privateKey)
-  const bridgeContract = new web3.eth.Contract(FOREIGN_ERC_TO_NATIVE_ABI, bridgeAddress)
-  await bridgeContract.methods.migrateToMCD().send({
-    from: validator.address,
-    gas: '4000000'
-  })
-}
-
 const initializeChaiToken = async (rpcUrl, bridgeAddress) => {
   const web3 = new Web3(new Web3.providers.HttpProvider(rpcUrl))
   web3.eth.accounts.wallet.add(validator.privateKey)
@@ -116,7 +106,6 @@ module.exports = {
   sendTokens,
   addValidator,
   sendAMBMessage,
-  migrateToMCD,
   initializeChaiToken,
   setMinDaiTokenBalance,
   convertDaiToChai