Add function assertions required for staking rewards fuzzing: withdrawDelegatorRewards, finalizePool, and endEpoch. Also adds payProtocolFee-related assertions to fillOrder

contracts/staking/test/unit_tests/delegator_reward_test.ts

@@ -1,20 +1,18 @@
 import {
+    assertIntegerRoughlyEquals as assertRoughlyEquals,
     blockchainTests,
     constants,
     expect,
     filterLogsToArguments,
+    getRandomInteger,
     Numberish,
     randomAddress,
+    toBaseUnitAmount,
 } from '@0x/contracts-test-utils';
 import { BigNumber, hexUtils } from '@0x/utils';
 import { LogEntry } from 'ethereum-types';
 
 import { artifacts } from '../artifacts';
-import {
-    assertIntegerRoughlyEquals as assertRoughlyEquals,
-    getRandomInteger,
-    toBaseUnitAmount,
-} from '../utils/number_utils';
 
 import {
     TestDelegatorRewardsContract,

contracts/staking/test/unit_tests/finalizer_test.ts

@@ -1,10 +1,13 @@
 import {
+    assertIntegerRoughlyEquals,
     blockchainTests,
     constants,
     expect,
     filterLogsToArguments,
+    getRandomInteger,
     Numberish,
     shortZip,
+    toBaseUnitAmount,
 } from '@0x/contracts-test-utils';
 import { BigNumber, hexUtils, StakingRevertErrors } from '@0x/utils';
 import { LogEntry } from 'ethereum-types';
@@ -13,7 +16,6 @@ import * as _ from 'lodash';
 import { constants as stakingConstants } from '../../src/constants';
 
 import { artifacts } from '../artifacts';
-import { assertIntegerRoughlyEquals, getRandomInteger, toBaseUnitAmount } from '../utils/number_utils';
 
 import {
     IStakingEventsEpochEndedEventArgs,

contracts/staking/test/unit_tests/lib_cobb_douglas_test.ts

@@ -1,9 +1,14 @@
-import { blockchainTests, Numberish } from '@0x/contracts-test-utils';
+import {
+    assertRoughlyEquals,
+    blockchainTests,
+    getRandomInteger,
+    getRandomPortion,
+    Numberish,
+    toDecimal,
+} from '@0x/contracts-test-utils';
 import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
-import { assertRoughlyEquals, getRandomInteger, getRandomPortion, toDecimal } from '../utils/number_utils';
-
 import { artifacts } from '../artifacts';
 import { TestCobbDouglasContract } from '../wrappers';
 

contracts/staking/test/unit_tests/lib_fixed_math_test.ts

@@ -1,10 +1,16 @@
-import { blockchainTests, expect, Numberish } from '@0x/contracts-test-utils';
-import { BigNumber, FixedMathRevertErrors, hexUtils } from '@0x/utils';
+import {
+    assertRoughlyEquals,
+    blockchainTests,
+    expect,
+    fromFixed,
+    Numberish,
+    toDecimal,
+    toFixed,
+} from '@0x/contracts-test-utils';
+import { BigNumber, FixedMathRevertErrors } from '@0x/utils';
 import { Decimal } from 'decimal.js';
 import * as _ from 'lodash';
 
-import { assertRoughlyEquals, fromFixed, toDecimal, toFixed } from '../utils/number_utils';
-
 import { artifacts } from '../artifacts';
 import { TestLibFixedMathContract } from '../wrappers';
 

contracts/staking/test/unit_tests/mixin_cumulative_rewards_test.ts

@@ -1,9 +1,8 @@
-import { blockchainTests, expect } from '@0x/contracts-test-utils';
+import { blockchainTests, expect, toBaseUnitAmount } from '@0x/contracts-test-utils';
 import { BigNumber } from '@0x/utils';
 import * as _ from 'lodash';
 
 import { constants as stakingConstants } from '../../src/constants';
-import { toBaseUnitAmount } from '../utils/number_utils';
 
 import { artifacts } from '../artifacts';
 import { TestMixinCumulativeRewardsContract } from '../wrappers';
@@ -74,7 +73,9 @@ blockchainTests.resets('MixinCumulativeRewards unit tests', env => {
             await testContract
                 .addCumulativeReward(testPoolId, testRewards[0].numerator, testRewards[0].denominator)
                 .awaitTransactionSuccessAsync();
-            const mostRecentCumulativeReward = await testContract.getMostRecentCumulativeReward(testPoolId).callAsync();
+            const [mostRecentCumulativeReward] = await testContract
+                .getMostRecentCumulativeReward(testPoolId)
+                .callAsync();
             expect(mostRecentCumulativeReward).to.deep.equal(testRewards[0]);
         });
 
@@ -86,7 +87,9 @@ blockchainTests.resets('MixinCumulativeRewards unit tests', env => {
             await testContract
                 .addCumulativeReward(testPoolId, testRewards[1].numerator, testRewards[1].denominator)
                 .awaitTransactionSuccessAsync();
-            const mostRecentCumulativeReward = await testContract.getMostRecentCumulativeReward(testPoolId).callAsync();
+            const [mostRecentCumulativeReward] = await testContract
+                .getMostRecentCumulativeReward(testPoolId)
+                .callAsync();
             expect(mostRecentCumulativeReward).to.deep.equal(testRewards[0]);
         });
 
@@ -98,7 +101,9 @@ blockchainTests.resets('MixinCumulativeRewards unit tests', env => {
             await testContract
                 .addCumulativeReward(testPoolId, testRewards[1].numerator, testRewards[1].denominator)
                 .awaitTransactionSuccessAsync();
-            const mostRecentCumulativeReward = await testContract.getMostRecentCumulativeReward(testPoolId).callAsync();
+            const [mostRecentCumulativeReward] = await testContract
+                .getMostRecentCumulativeReward(testPoolId)
+                .callAsync();
             expect(mostRecentCumulativeReward).to.deep.equal(sumOfTestRewardsNormalized);
         });
     });

contracts/staking/test/unit_tests/protocol_fees_test.ts

@@ -3,6 +3,7 @@ import {
     constants,
     expect,
     filterLogsToArguments,
+    getRandomInteger,
     Numberish,
     randomAddress,
 } from '@0x/contracts-test-utils';
@@ -19,8 +20,6 @@ import {
     TestProtocolFeesEvents,
 } from '../wrappers';
 
-import { getRandomInteger } from '../utils/number_utils';
-
 blockchainTests('Protocol Fees unit tests', env => {
     let ownerAddress: string;
     let exchangeAddress: string;