From 8dba7850b3c17d99ada55d334163bc2df81e29ac Mon Sep 17 00:00:00 2001 From: Gerardo Nardelli Date: Wed, 15 Apr 2020 19:10:05 -0300 Subject: [PATCH] Remove migrateToMCD method --- .../ForeignBridgeErcToNative.sol | 14 --------- test/erc_to_native/foreign_bridge.test.js | 30 ------------------- 2 files changed, 44 deletions(-) diff --git a/contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol b/contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol index a5678b3e1..e00a49f53 100644 --- a/contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol +++ b/contracts/upgradeable_contracts/erc20_to_native/ForeignBridgeErcToNative.sol @@ -104,20 +104,6 @@ contract ForeignBridgeErcToNative is BasicForeignBridge, ERC20Bridge, OtherSideB revert(); } - function migrateToMCD() external { - bytes32 storageAddress = 0x3378953eb16363e06fd9ea9701d36ed7285d206d9de7df55b778462d74596a89; // keccak256(abi.encodePacked("migrationToMcdCompleted")) - require(!boolStorage[storageAddress]); - - address mcdContract = IDaiAdapter(migrationContract().daiJoin()).dai(); - setErc20token(mcdContract); - - uintStorage[MIN_HDTOKEN_BALANCE] = 10 ether; - - swapTokens(); - - boolStorage[storageAddress] = true; - } - function saiTopContract() internal pure returns (ISaiTop) { return ISaiTop(0x9b0ccf7C8994E19F39b2B4CF708e0A7DF65fA8a3); } diff --git a/test/erc_to_native/foreign_bridge.test.js b/test/erc_to_native/foreign_bridge.test.js index c87be1a9c..30d64a23d 100644 --- a/test/erc_to_native/foreign_bridge.test.js +++ b/test/erc_to_native/foreign_bridge.test.js @@ -1148,36 +1148,6 @@ contract('ForeignBridge_ERC20_to_Native', async accounts => { expect(await token.balanceOf(foreignBridge.address)).to.be.bignumber.equal(minDaiLimit) }) }) - describe('migrateToMCD', () => { - let foreignBridge - beforeEach(async () => { - foreignBridge = await ForeignBridgeErcToNativeMock.new() - - await foreignBridge.initialize( - validatorContract.address, - sai.address, - requireBlockConfirmations, - gasPrice, - [dailyLimit, maxPerTx, minPerTx], - [homeDailyLimit, homeMaxPerTx], - owner, - decimalShiftZero, - otherSideBridge.address - ) - - // Mint the bridge some sai tokens - await sai.mint(foreignBridge.address, oneEther) - }) - it('should not be able to swap tokens', async () => { - // Given - expect(await sai.balanceOf(foreignBridge.address)).to.be.bignumber.equal(oneEther) - expect(await dai.balanceOf(foreignBridge.address)).to.be.bignumber.equal(ZERO) - expect(await foreignBridge.erc20token()).to.be.equal(sai.address) - - // When - await foreignBridge.migrateToMCD({ from: owner }).should.be.rejectedWith(ERROR_MSG) - }) - }) describe('support two tokens', () => { let foreignBridge const recipient = accounts[8]