Merge pull request #334 from OpenZeppelin/upgrade/truffle-3.4.6

Upgrade truffle to 3.4.6
OpenZeppelin · Jul 26, 2017 · 91e5a92 · 91e5a92
2 parents 93fb8f3 + 5e7c168
commit 91e5a92
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 3,107 deletions.
diff --git a/contracts/token/VestedToken.sol b/contracts/token/VestedToken.sol
@@ -72,7 +72,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
    * @param _grantId The id of the token grant.
    */
   function revokeTokenGrant(address _holder, uint256 _grantId) public {
-    TokenGrant grant = grants[_holder][_grantId];
+    TokenGrant storage grant = grants[_holder][_grantId];
 
     require(grant.revokable);
     require(grant.granter == msg.sender); // Only granter can revoke it
@@ -186,7 +186,7 @@ contract VestedToken is StandardToken, LimitedTransferToken {
    * revokability, burnsOnRevoke, and vesting) plus the vested value at the current time.
    */
   function tokenGrant(address _holder, uint256 _grantId) constant returns (address granter, uint256 value, uint256 vested, uint64 start, uint64 cliff, uint64 vesting, bool revokable, bool burnsOnRevoke) {
-    TokenGrant grant = grants[_holder][_grantId];
+    TokenGrant storage grant = grants[_holder][_grantId];
 
     granter = grant.granter;
     value = grant.value;

diff --git a/package.json b/package.json
@@ -35,6 +35,7 @@
     "babel-preset-stage-2": "^6.18.0",
     "babel-preset-stage-3": "^6.17.0",
     "babel-register": "^6.23.0",
+    "babel-polyfill": "^6.23.0",
     "chai": "^4.0.2",
     "chai-as-promised": "^7.0.0",
     "chai-bignumber": "^2.0.0",
@@ -43,6 +44,6 @@
     "mocha-lcov-reporter": "^1.3.0",
     "moment": "^2.18.1",
     "solidity-coverage": "^0.1.7",
-    "truffle": "3.2.2"
+    "truffle": "^3.4.6"
   }
 }
diff --git a/test/Crowdsale.js b/test/Crowdsale.js
@@ -45,7 +45,7 @@ contract('Crowdsale', function ([_, investor, wallet, purchaser]) {
 
     it('should reject payments before start', async function () {
       await this.crowdsale.send(value).should.be.rejectedWith(EVMThrow)
-      await this.crowdsale.buyTokens(investor, value, {from: purchaser}).should.be.rejectedWith(EVMThrow)
+      await this.crowdsale.buyTokens(investor, {from: purchaser, value: value}).should.be.rejectedWith(EVMThrow)
     })
 
     it('should accept payments after start', async function () {

diff --git a/test/DayLimit.js b/test/DayLimit.js
@@ -13,7 +13,7 @@ contract('DayLimit', function(accounts) {
   beforeEach( async function() {
     dayLimit = await DayLimitMock.new(initLimit);
   });
-  
+
   it('should construct with the passed daily limit', async function() {
     let dailyLimit = await dayLimit.dailyLimit();
     assert.equal(initLimit, dailyLimit);
@@ -76,7 +76,7 @@ contract('DayLimit', function(accounts) {
     spentToday = await dayLimit.spentToday();
     assert.equal(spentToday, 8);
 
-    await dayLimit.resetSpentToday(15);
+    await dayLimit.resetSpentToday();
     await dayLimit.attemptSpend(3);
     spentToday = await dayLimit.spentToday();
     assert.equal(spentToday, 3);