fix CI failures

0xProject · Dec 10, 2019 · 2f9891f · 2f9891f
1 parent 865a2b1
commit 2f9891f
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 20 deletions.
diff --git a/contracts/exchange/test/reference_functions.ts b/contracts/exchange/test/reference_functions.ts
@@ -107,23 +107,6 @@ describe('Reference functions', () => {
             ).to.throw(expectedError.message);
         });
 
-        it('reverts if `order.makerAssetAmount` is 0', () => {
-            const order = makeOrder({
-                makerAssetAmount: constants.ZERO_AMOUNT,
-                takerAssetAmount: ONE_ETHER,
-            });
-            const takerAssetFilledAmount = ONE_ETHER;
-            const expectedError = new LibMathRevertErrors.DivisionByZeroError();
-            return expect(() =>
-                LibReferenceFunctions.calculateFillResults(
-                    order,
-                    takerAssetFilledAmount,
-                    DEFAULT_PROTOCOL_FEE_MULTIPLIER,
-                    DEFAULT_GAS_PRICE,
-                ),
-            ).to.throw(expectedError.message);
-        });
-
         it('reverts if `order.takerAssetAmount` is 0', () => {
             const order = makeOrder({
                 makerAssetAmount: ONE_ETHER,

diff --git a/contracts/staking/src/index.ts b/contracts/staking/src/index.ts
@@ -45,7 +45,6 @@ export { StakingRevertErrors, FixedMathRevertErrors } from '@0x/utils';
 export { constants } from './constants';
 export {
     AggregatedStats,
-    AggregatedStatsByEpoch,
     StakeInfo,
     StakeStatus,
     StoredBalance,
@@ -57,6 +56,7 @@ export {
     GlobalStakeByStatus,
     StakingPool,
     PoolStats,
+    Numberish,
 } from './types';
 export {
     ContractArtifact,

diff --git a/contracts/staking/src/types.ts b/contracts/staking/src/types.ts
@@ -231,3 +231,5 @@ export class AggregatedStats {
 export interface AggregatedStatsByEpoch {
     [epoch: string]: AggregatedStats;
 }
+
+export type Numberish = Numberish;
diff --git a/contracts/staking/test/unit_tests/lib_fixed_math_test.ts b/contracts/staking/test/unit_tests/lib_fixed_math_test.ts
@@ -7,7 +7,7 @@ import {
     toDecimal,
     toFixed,
 } from '@0x/contracts-test-utils';
-import { BigNumber, FixedMathRevertErrors } from '@0x/utils';
+import { BigNumber, FixedMathRevertErrors, hexUtils } from '@0x/utils';
 import { Decimal } from 'decimal.js';
 import * as _ from 'lodash';
 

diff --git a/contracts/test-utils/package.json b/contracts/test-utils/package.json
@@ -36,7 +36,6 @@
     "devDependencies": {
         "@0x/sol-compiler": "^4.0.1",
         "@0x/tslint-config": "^4.0.0",
-        "decimal.js": "^10.2.0",
         "npm-run-all": "^4.1.2",
         "shx": "^0.2.2",
         "tslint": "5.11.0",
@@ -66,6 +65,7 @@
         "chai": "^4.0.1",
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
+        "decimal.js": "^10.2.0",
         "dirty-chai": "^2.0.1",
         "ethereum-types": "^3.0.0",
         "ethereumjs-util": "^5.1.1",