Update migration plugin

makerdao · Nov 12, 2019 · f7bd36f · f7bd36f
1 parent f961d3d
commit f7bd36f
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 12 deletions.
diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "@babel/plugin-proposal-throw-expressions": "^7.2.0",
     "@babel/plugin-transform-runtime": "^7.3.4",
     "@babel/preset-env": "^7.4.5",
-    "@makerdao/testchain": "^0.2.16",
+    "@makerdao/testchain": "^0.2.16-1",
     "babel-eslint": "^10.0.1",
     "babel-jest": "^24.8.0",
     "babel-loader": "^8.0.5",

diff --git a/packages/dai-plugin-migrations/contracts/addresses/testnet.json b/packages/dai-plugin-migrations/contracts/addresses/testnet.json
@@ -8,6 +8,6 @@
   "MCD_POT_1": "0x8c4be23de45f82a4fec7a93f69929bd2a13a4777",
   "REDEEMER": "0x2daf1c09275b0b72277909377eb20ccf10efa02e",
   "OLD_MKR": "0xa3bfc24194007416fa73fc6e3a7d3b245f647d6e",
-  "MIGRATION": "0x689e9dc3214ac88f312fdd148684bf199ccf596c",
-  "MIGRATION_PROXY_ACTIONS": "0xd324bc539b85e6dfe08005c4d261d0ff22b0a34c"
+  "MIGRATION": "0x23c9aafe0d1968eac6d9f1edb9fa831641783fed",
+  "MIGRATION_PROXY_ACTIONS": "0xdb8848ea69cce3f7f41949d274899641e558cdf4"
 }
diff --git a/packages/dai-plugin-migrations/src/migrations/SaiToDai.js b/packages/dai-plugin-migrations/src/migrations/SaiToDai.js
@@ -23,9 +23,6 @@ export default class SaiToDai {
       address,
       migrationContract.address
     );
-    console.log(allowance.toNumber());
-    console.log(formattedAmount * 1.5);
-    console.log(migrationContract.address);
     if (allowance.toNumber() < amount) {
       await this._sai.approve(migrationContract.address, formattedAmount, {
         promise

diff --git a/packages/dai-plugin-migrations/test/kovan/kovan.test.js b/packages/dai-plugin-migrations/test/kovan/kovan.test.js
@@ -41,7 +41,7 @@ async function openLockAndDrawScdCdp(drawAmount, maker) {
   return cdp;
 }
 
-test('kovan', async () => {
+xtest('kovan', async () => {
   const maker = await mcdMaker();
   const sai = maker.getToken(SAI);
   const mkr = maker.getToken(MKR);

diff --git a/packages/dai-plugin-migrations/test/migrations/SaiToDai.spec.js b/packages/dai-plugin-migrations/test/migrations/SaiToDai.spec.js
@@ -48,7 +48,6 @@ describe('SDai to MDai Migration', () => {
       .service('token')
       .getToken('MDAI')
       .balanceOf(address);
-    console.log(saiBalanceBeforeMigration);
 
     await migration.execute(1);
 

diff --git a/yarn.lock b/yarn.lock
@@ -1701,10 +1701,10 @@
     js-sha3 "^0.8.0"
     lodash "^4.17.11"
 
-"@makerdao/testchain@^0.2.16":
-  version "0.2.16"
-  resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-0.2.16.tgz#7b93c3170c542035751f184bebe091a370af266b"
-  integrity sha512-PyYcjphbN4Cy2qSJ1MAyFAG3LUH/pKiIwFHgaoJ5jYv/1uQo+dt83hWwjdhU/f5op/QgSQcKEgb5KZ7LjNw1oA==
+"@makerdao/testchain@^0.2.16-1":
+  version "0.2.16-1"
+  resolved "https://registry.yarnpkg.com/@makerdao/testchain/-/testchain-0.2.16-1.tgz#35fe04591cf40691f5dacdca96d455bab9b3f637"
+  integrity sha512-sPWvIeasOauPHqB1DnpQ2/P8ZR6GVvIYZcutQiDcVXQj3iIwEpZZH47eBeqsMze2MnbGFFWFjHOwO8sCiGqt2Q==
   dependencies:
     ganache-cli makerdao/ganache-cli#fix/gas-est-crash