get everything working again after the merge

Author: ewingrj

config/contracts.js

@@ -54,11 +54,21 @@ module.exports = {
       '$WEB3', // uses pre existing web3 object if available (e.g in Mist)
     ],
     contracts: {
+      RecoveryVault: {},
       LPVault: {},
       LiquidPledgingMock: {},
-      RecoveryVault: {},
+      Kernel: {
+        args: {
+          _shouldPetrify: 'false',
+        },
+      },
+      ACL: {},
+      DAOFactory: {
+        args: ['$Kernel', '$ACL', '0x0000000000000000000000000000000000000000'],
+      },
       LPFactory: {
         args: {
+          _daoFactory: '$DAOFactory',
           _vaultBase: '$LPVault',
           _lpBase: '$LiquidPledgingMock',
         },

package.json

@@ -11,8 +11,7 @@
     "test": "embark test",
     "compile:sol": "embark build --contracts",
     "compile:js": "babel -d lib/ js/",
-    "compile": "npm run compile:sol && npm run compile:js",
-    "build": "npm run compile",
+    "build": "npm run compile:sol && npm run compile:js",
     "prepublish": "npm run build"
   },
   "repository": {

test/LPVault.js

@@ -27,12 +27,6 @@ describe('LPVault test', function() {
     vaultOwner = accounts[3];
     escapeHatchCaller = accounts[4];
     restrictedPaymentsConfirmer = accounts[5];
-
-    recoveryVault = deployment.recoveryVault;
-    vault = deployment.vault;
-    liquidPledging = deployment.liquidPledging;
-    liquidPledgingState = deployment.liquidPledgingState;
-    token = deployment.token;
   });
 
   it('Should deploy LPVault contract', async function() {

test/NormalOperation.js

@@ -6,6 +6,8 @@ const { assert } = require('chai');
 const deployLP = require('./helpers/deployLP');
 const assertFail = require('./helpers/assertFail');
 
+const { toBN, toWei, fromWei } = utils;
+
 const printState = async liquidPledgingState => {
   const st = await liquidPledgingState.getState();
   console.log(JSON.stringify(st, null, 2));
@@ -118,7 +120,9 @@ describe('LiquidPledging test', function() {
     assert.equal(res[4], 86400);
   });
   it('Should make a donation', async () => {
-    const r = await liquidPledging.donate(1, 1, giver1Token.$address, utils.toWei('1'), {
+    const giver1PreBal = await giver1Token.balanceOf(giver1);
+
+    await liquidPledging.donate(1, 1, giver1Token.$address, utils.toWei('1'), {
       from: giver1,
       $extraGas: 100000,
     });
@@ -128,9 +132,10 @@ describe('LiquidPledging test', function() {
     assert.equal(p.amount, utils.toWei('1'));
     assert.equal(p.owner, 1);
     const vaultBal = await giver1Token.balanceOf(vault.$address);
-    const giver1Bal = await giver1Token.balanceOf(giver1);
+    const giver1PostBal = await giver1Token.balanceOf(giver1);
+
     assert.equal(vaultBal, web3.utils.toWei('1'));
-    assert.equal(giver1Bal, web3.utils.toWei('999'));
+    assert.equal(giver1PostBal, toBN(giver1PreBal).sub(toBN(toWei('1'))).toString());
   });
   it('Should create a delegate', async () => {
     await liquidPledging.addDelegate(

test/helpers/deployLP.js

@@ -14,10 +14,14 @@ config(
       RecoveryVault: {},
       LPVault: {},
       LiquidPledgingMock: {},
-      Kernel: {},
+      Kernel: {
+        args: {
+          _shouldPetrify: 'false',
+        },
+      },
       ACL: {},
       DAOFactory: {
-        args: ['$Kernel','$ACL', '0x0000000000000000000000000000000000000000']
+        args: ['$Kernel', '$ACL', '0x0000000000000000000000000000000000000000'],
       },
       LPFactory: {
         args: {
@@ -27,7 +31,7 @@ config(
         },
       },
       StandardToken: {},
-    }
+    },
   },
   (err, theAccounts) => {
     accounts = theAccounts;