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

@0x/contracts-exchange: Update tests in isolated_fill_order.ts.

Browse Source
This commit is contained in:
Lawrence Forman
2019-08-01 01:37:01 -04:00
parent 41e04c0178
commit 9d5b23acd3
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/exchange/test/isolated_fill_order.ts
View File

@@ -34,8 +34,8 @@ blockchainTests.only('Isolated fillOrder() tests', env => {
feeRecipientAddress: randomAddress(), feeRecipientAddress: randomAddress(),
makerAssetAmount: ONE_ETHER, makerAssetAmount: ONE_ETHER,
takerAssetAmount: ONE_ETHER.times(2), takerAssetAmount: ONE_ETHER.times(2),
makerFee: ONE_ETHER.times(0.015), makerFee: ONE_ETHER.times(0.0015),
takerFee: ONE_ETHER.times(0.025), takerFee: ONE_ETHER.times(0.0025),
salt: ZERO_AMOUNT, salt: ZERO_AMOUNT,
expirationTimeSeconds: new BigNumber(TOMORROW), expirationTimeSeconds: new BigNumber(TOMORROW),
makerAssetData: createGoodAssetData(), makerAssetData: createGoodAssetData(),
@@ -68,12 +68,14 @@ blockchainTests.only('Isolated fillOrder() tests', env => {
async function fillOrderAndAssertResultsAsync( async function fillOrderAndAssertResultsAsync(
order: Order, order: Order,
takerAssetFillAmount: BigNumber, takerAssetFillAmount: BigNumber,
signature?: string,
): Promise<FillOrderAndAssertResultsResults> { ): Promise<FillOrderAndAssertResultsResults> {
const orderInfo = await exchange.getOrderInfoAsync(order); const orderInfo = await exchange.getOrderInfoAsync(order);
const efr = calculateExpectedFillResults(order, orderInfo, takerAssetFillAmount); const efr = calculateExpectedFillResults(order, orderInfo, takerAssetFillAmount);
const eoi = calculateExpectedOrderInfo(order, orderInfo, efr); const eoi = calculateExpectedOrderInfo(order, orderInfo, efr);
const efb = calculateExpectedFillBalances(order, efr); const efb = calculateExpectedFillBalances(order, efr);
const fillResults = await exchange.fillOrderAsync(order, takerAssetFillAmount); // Fill the order.
const fillResults = await exchange.fillOrderAsync(order, takerAssetFillAmount, signature);
const newOrderInfo = await exchange.getOrderInfoAsync(order); const newOrderInfo = await exchange.getOrderInfoAsync(order);
// Check returned fillResults. // Check returned fillResults.
expect(fillResults.makerAssetFilledAmount) expect(fillResults.makerAssetFilledAmount)
@@ -545,8 +547,8 @@ blockchainTests.only('Isolated fillOrder() tests', env => {
const takerAssetFillAmounts = splitAmount(order.takerAssetAmount); const takerAssetFillAmounts = splitAmount(order.takerAssetAmount);
const goodSignature = createGoodSignature(SignatureType.EthSign); const goodSignature = createGoodSignature(SignatureType.EthSign);
const badSignature = createBadSignature(SignatureType.EthSign); const badSignature = createBadSignature(SignatureType.EthSign);
await exchange.fillOrderAsync(order, takerAssetFillAmounts[0], goodSignature); await fillOrderAndAssertResultsAsync(order, takerAssetFillAmounts[0], goodSignature);
await exchange.fillOrderAsync(order, takerAssetFillAmounts[1], badSignature); await fillOrderAndAssertResultsAsync(order, takerAssetFillAmounts[1], badSignature);
}); });
}); });
}); });