diff --git a/test/DayLimit.js b/test/DayLimit.js index 66befb00e..9d96383c5 100644 --- a/test/DayLimit.js +++ b/test/DayLimit.js @@ -1,6 +1,7 @@ 'use strict'; const assertJump = require('./helpers/assertJump'); -const timer = require('./helpers/timer'); +import latestTime from './helpers/latestTime' +import {increaseTimeTo, duration} from './helpers/increaseTime' var DayLimitMock = artifacts.require('./helpers/DayLimitMock.sol'); @@ -11,6 +12,7 @@ contract('DayLimit', function(accounts) { let initLimit = 10; beforeEach( async function() { + this.startTime = latestTime(); dayLimit = await DayLimitMock.new(initLimit); }); @@ -99,7 +101,7 @@ contract('DayLimit', function(accounts) { spentToday = await dayLimit.spentToday(); assert.equal(spentToday, 8); - await timer(day); + await increaseTimeTo(this.startTime + duration.days(1)); await dayLimit.attemptSpend(3); spentToday = await dayLimit.spentToday(); diff --git a/test/helpers/timer.js b/test/helpers/timer.js deleted file mode 100644 index a947b0849..000000000 --- a/test/helpers/timer.js +++ /dev/null @@ -1,29 +0,0 @@ -'use strict'; - -// timer for tests specific to testrpc -// s is the amount of seconds to advance -// if account is provided, will send a transaction from that account to force testrpc to mine the block -module.exports = (s) => { - return new Promise((resolve, reject) => { - web3.currentProvider.sendAsync({ - jsonrpc: '2.0', - method: 'evm_increaseTime', - params: [s], - id: new Date().getTime() - }, function(err) { - if (err) { - return reject(err); - } - web3.currentProvider.sendAsync({ - jsonrpc: '2.0', - method: 'evm_mine', - id: new Date().getTime() - }, (err, result) => { - if (err) { - return reject(err); - } - resolve(result); - }); - }); - }); -};