Payroll: Use TimeHelpersMock to simulate past

aragon · Apr 12, 2019 · 1a9cdf7 · 1a9cdf7
1 parent ac42479
commit 1a9cdf7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/future-apps/payroll/test/contracts/Payroll_gas_costs.test.js b/future-apps/payroll/test/contracts/Payroll_gas_costs.test.js
@@ -32,7 +32,6 @@ contract('Payroll gas costs', ([owner, employee, anotherEmployee]) => {
 
     beforeEach('initialize payroll app', async () => {
       await payroll.initialize(finance.address, denominationToken.address, priceFeed.address, RATE_EXPIRATION_TIME, { from: owner })
-      await payroll.mockSetTimestamp(NOW)
 
       const startDate = NOW - ONE_MONTH
       const salary = annualSalaryPerSecond(100000, TOKEN_DECIMALS)

diff --git a/future-apps/payroll/test/contracts/Payroll_payday.test.js b/future-apps/payroll/test/contracts/Payroll_payday.test.js
@@ -150,7 +150,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
                 context('when exchange rates are expired', () => {
                   beforeEach('expire exchange rates', async () => {
-                    await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                    await priceFeed.mockDecreaseTime(TWO_MONTHS)
                   })
 
                   it('reverts', async () => {
@@ -199,7 +199,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
                   context('when exchange rates are expired', () => {
                     beforeEach('expire exchange rates', async () => {
-                      await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                      await priceFeed.mockDecreaseTime(TWO_MONTHS)
                     })
 
                     it('reverts', async () => {
@@ -249,7 +249,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
           context('when exchange rates are expired', () => {
             beforeEach('expire exchange rates', async () => {
-              await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+              await priceFeed.mockDecreaseTime(TWO_MONTHS)
             })
 
             itReverts(expiredRatesReason)
@@ -496,7 +496,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
                 context('when exchange rates are expired', () => {
                   beforeEach('expire exchange rates', async () => {
-                    await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                    await priceFeed.mockDecreaseTime(TWO_MONTHS)
                   })
 
                   it('reverts', async () => {
@@ -548,7 +548,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
                     context('when exchange rates are expired', () => {
                       beforeEach('expire exchange rates', async () => {
-                        await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                        await priceFeed.mockDecreaseTime(TWO_MONTHS)
                       })
 
                       it('reverts', async () => {
@@ -638,7 +638,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
                     context('when exchange rates are expired', () => {
                       beforeEach('expire exchange rates', async () => {
-                        await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                        await priceFeed.mockDecreaseTime(TWO_MONTHS)
                       })
 
                       it('reverts', async () => {
@@ -735,7 +735,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
           context('when exchange rates are expired', () => {
             beforeEach('expire exchange rates', async () => {
-              await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+              await priceFeed.mockDecreaseTime(TWO_MONTHS)
             })
 
             itReverts(requestedAmount, expiredRatesReason)
@@ -963,7 +963,7 @@ contract('Payroll payday', ([owner, employee, anotherEmployee, anyone]) => {
 
                   context('when exchange rates are expired', () => {
                     beforeEach('expire exchange rates', async () => {
-                      await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                      await priceFeed.mockDecreaseTime(TWO_MONTHS)
                     })
 
                     it('reverts', async () => {

diff --git a/future-apps/payroll/test/contracts/Payroll_reimbursements.test.js b/future-apps/payroll/test/contracts/Payroll_reimbursements.test.js
@@ -216,7 +216,7 @@ contract('Payroll reimbursements', ([owner, employee, anotherEmployee, anyone])
 
               context('when exchange rates are expired', () => {
                 beforeEach('expire exchange rates', async () => {
-                  await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                  await priceFeed.mockDecreaseTime(TWO_MONTHS)
                 })
 
                 it('reverts', async () => {
@@ -265,7 +265,7 @@ contract('Payroll reimbursements', ([owner, employee, anotherEmployee, anyone])
 
                 context('when exchange rates are expired', () => {
                   beforeEach('expire exchange rates', async () => {
-                    await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                    await priceFeed.mockDecreaseTime(TWO_MONTHS)
                   })
 
                   it('reverts', async () => {
@@ -418,7 +418,7 @@ contract('Payroll reimbursements', ([owner, employee, anotherEmployee, anyone])
 
               context('when exchange rates are expired', () => {
                 beforeEach('expire exchange rates', async () => {
-                  await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                  await priceFeed.mockDecreaseTime(TWO_MONTHS)
                 })
 
                 it('reverts', async () => {
@@ -470,7 +470,7 @@ contract('Payroll reimbursements', ([owner, employee, anotherEmployee, anyone])
 
                   context('when exchange rates are expired', () => {
                     beforeEach('expire exchange rates', async () => {
-                      await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                      await priceFeed.mockDecreaseTime(TWO_MONTHS)
                     })
 
                     it('reverts', async () => {
@@ -560,7 +560,7 @@ contract('Payroll reimbursements', ([owner, employee, anotherEmployee, anyone])
 
                   context('when exchange rates are expired', () => {
                     beforeEach('expire exchange rates', async () => {
-                      await priceFeed.mockSetTimestamp(NOW - TWO_MONTHS)
+                      await priceFeed.mockDecreaseTime(TWO_MONTHS)
                     })
 
                     it('reverts', async () => {

diff --git a/shared/test-helpers/contracts/TimeHelpersMock.sol b/shared/test-helpers/contracts/TimeHelpersMock.sol
@@ -27,6 +27,14 @@ contract TimeHelpersMock is TimeHelpers {
         else mockedTimestamp = block.timestamp.add(_seconds);
     }
 
+    /**
+    * @dev Decreases the mocked timestamp value, used only for testing purposes
+    */
+    function mockDecreaseTime(uint256 _seconds) public {
+        if (mockedTimestamp != 0) mockedTimestamp = mockedTimestamp.sub(_seconds);
+        else mockedTimestamp = block.timestamp.sub(_seconds);
+    }
+
     /**
     * @dev Advances the mocked block number value, used only for testing purposes
     */