crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@0x:contracts-integrations Removed dependence on number_utils from staking

Browse Source
This commit is contained in:
Alex Towle 2019-11-09 22:42:04 -05:00
parent 18769f0b8f
commit 72cdd1ea50
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/integrations/test/internal-integration-tests/match_orders_test.ts
View File

@ -1,8 +1,7 @@
import { DevUtilsContract } from '@0x/contracts-dev-utils'; import { DevUtilsContract } from '@0x/contracts-dev-utils';
import { BlockchainBalanceStore, TokenIds } from '@0x/contracts-exchange'; import { BlockchainBalanceStore, TokenIds } from '@0x/contracts-exchange';
import { ReferenceFunctions as LibReferenceFunctions } from '@0x/contracts-exchange-libs'; import { ReferenceFunctions as LibReferenceFunctions } from '@0x/contracts-exchange-libs';
import { toBaseUnitAmount } from '@0x/contracts-staking'; import { blockchainTests, constants, expect, toBaseUnitAmount } from '@0x/contracts-test-utils';
import { blockchainTests, constants, expect } from '@0x/contracts-test-utils';
import { assetDataUtils, ExchangeRevertErrors, orderHashUtils } from '@0x/order-utils'; import { assetDataUtils, ExchangeRevertErrors, orderHashUtils } from '@0x/order-utils';
import { Order, OrderStatus, SignedOrder } from '@0x/types'; import { Order, OrderStatus, SignedOrder } from '@0x/types';
import { BigNumber } from '@0x/utils'; import { BigNumber } from '@0x/utils';

6
contracts/test-utils/src/number_utils.ts
View File

@ -81,10 +81,10 @@ export function assertIntegerRoughlyEquals(actual: Numberish, expected: Numberis
/** /**
* Converts `amount` into a base unit amount with 18 digits. * Converts `amount` into a base unit amount with 18 digits.
*/ */
export function toBaseUnitAmount(amount: Numberish): BigNumber { export function toBaseUnitAmount(amount: Numberish, decimals?: number): BigNumber {
const decimals = 18; const baseDecimals = decimals !== undefined ? decimals : 18;
const amountAsBigNumber = new BigNumber(amount); const amountAsBigNumber = new BigNumber(amount);
const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amountAsBigNumber, decimals); const baseUnitAmount = Web3Wrapper.toBaseUnitAmount(amountAsBigNumber, baseDecimals);
return baseUnitAmount; return baseUnitAmount;
} }