Revert variable naming
This commit is contained in:
Amir Bandeali
@@ -88,8 +88,8 @@ describe('Exchange', () => {
|
||||
feeRecipientAddress,
|
||||
makerTokenAddress: rep.address,
|
||||
takerTokenAddress: dgd.address,
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
|
||||
takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
|
||||
};
|
||||
@@ -143,80 +143,80 @@ describe('Exchange', () => {
|
||||
|
||||
it('should create an unfillable order', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: new BigNumber(1001),
|
||||
makerBuyAmount: new BigNumber(3),
|
||||
makerTokenAmount: new BigNumber(1001),
|
||||
takerTokenAmount: new BigNumber(3),
|
||||
});
|
||||
|
||||
const makerAmountBoughtBefore = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const takerTokenFilledAmountBefore = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtBefore).to.be.bignumber.equal(0);
|
||||
expect(takerTokenFilledAmountBefore).to.be.bignumber.equal(0);
|
||||
|
||||
const fillTakerTokenAmount1 = new BigNumber(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount: fillTakerTokenAmount1,
|
||||
takerTokenFillAmount: fillTakerTokenAmount1,
|
||||
});
|
||||
|
||||
const filledTakerTokenAmountAfter1 = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const takerTokenFilledAmountAfter1 = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(filledTakerTokenAmountAfter1).to.be.bignumber.equal(fillTakerTokenAmount1);
|
||||
expect(takerTokenFilledAmountAfter1).to.be.bignumber.equal(fillTakerTokenAmount1);
|
||||
|
||||
const fillTakerTokenAmount2 = new BigNumber(1);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount: fillTakerTokenAmount2,
|
||||
takerTokenFillAmount: fillTakerTokenAmount2,
|
||||
});
|
||||
|
||||
const filledTakerTokenAmountAfter2 = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const takerTokenFilledAmountAfter2 = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(filledTakerTokenAmountAfter2).to.be.bignumber.equal(filledTakerTokenAmountAfter1);
|
||||
expect(takerTokenFilledAmountAfter2).to.be.bignumber.equal(takerTokenFilledAmountAfter1);
|
||||
});
|
||||
|
||||
it('should transfer the correct amounts when makerSellAmount === makerBuyAmount', async () => {
|
||||
it('should transfer the correct amounts when makerTokenAmount === takerTokenAmount', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
});
|
||||
|
||||
const makerAmountBoughtBefore = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const takerTokenFilledAmountBefore = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtBefore).to.be.bignumber.equal(0);
|
||||
expect(takerTokenFilledAmountBefore).to.be.bignumber.equal(0);
|
||||
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerSellAmount });
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerTokenFillAmount });
|
||||
|
||||
const makerAmountBoughtAfter = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const makerAmountBoughtAfter = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtAfter).to.be.bignumber.equal(takerSellAmount);
|
||||
expect(makerAmountBoughtAfter).to.be.bignumber.equal(takerTokenFillAmount);
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFeePaid = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFeePaid = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
expect(newBalances[makerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFeePaid),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFeePaid),
|
||||
@@ -226,50 +226,50 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should transfer the correct amounts when makerSellAmount > makerBuyAmount', async () => {
|
||||
it('should transfer the correct amounts when makerTokenAmount > takerTokenAmount', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
});
|
||||
|
||||
const makerAmountBoughtBefore = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const takerTokenFilledAmountBefore = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtBefore).to.be.bignumber.equal(0);
|
||||
expect(takerTokenFilledAmountBefore).to.be.bignumber.equal(0);
|
||||
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerSellAmount });
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerTokenFillAmount });
|
||||
|
||||
const makerAmountBoughtAfter = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const makerAmountBoughtAfter = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtAfter).to.be.bignumber.equal(takerSellAmount);
|
||||
expect(makerAmountBoughtAfter).to.be.bignumber.equal(takerTokenFillAmount);
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFeePaid = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFeePaid = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
expect(newBalances[makerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFeePaid),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFeePaid),
|
||||
@@ -279,50 +279,50 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should transfer the correct amounts when makerSellAmount < makerBuyAmount', async () => {
|
||||
it('should transfer the correct amounts when makerTokenAmount < takerTokenAmount', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
});
|
||||
|
||||
const makerAmountBoughtBefore = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const takerTokenFilledAmountBefore = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtBefore).to.be.bignumber.equal(0);
|
||||
expect(takerTokenFilledAmountBefore).to.be.bignumber.equal(0);
|
||||
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerSellAmount });
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerTokenFillAmount });
|
||||
|
||||
const makerAmountBoughtAfter = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const makerAmountBoughtAfter = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtAfter).to.be.bignumber.equal(takerSellAmount);
|
||||
expect(makerAmountBoughtAfter).to.be.bignumber.equal(takerTokenFillAmount);
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFeePaid = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFeePaid = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
expect(newBalances[makerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFeePaid),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFeePaid),
|
||||
@@ -335,49 +335,49 @@ describe('Exchange', () => {
|
||||
it('should transfer the correct amounts when taker is specified and order is claimed by taker', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
takerAddress,
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
});
|
||||
|
||||
const makerAmountBoughtBefore = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const takerTokenFilledAmountBefore = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
expect(makerAmountBoughtBefore).to.be.bignumber.equal(0);
|
||||
expect(takerTokenFilledAmountBefore).to.be.bignumber.equal(0);
|
||||
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerSellAmount });
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerTokenFillAmount });
|
||||
|
||||
const makerAmountBoughtAfter = await exWrapper.getMakerAmountBoughtAsync(
|
||||
const makerAmountBoughtAfter = await exWrapper.getTakerTokenFilledAmount(
|
||||
orderUtils.getOrderHashHex(signedOrder),
|
||||
);
|
||||
const expectedMakerAmountBoughtAfter = takerSellAmount.add(makerAmountBoughtBefore);
|
||||
const expectedMakerAmountBoughtAfter = takerTokenFillAmount.add(takerTokenFilledAmountBefore);
|
||||
expect(makerAmountBoughtAfter).to.be.bignumber.equal(expectedMakerAmountBoughtAfter);
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFeePaid = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFeePaid = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
expect(newBalances[makerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFeePaid),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFeePaid),
|
||||
@@ -387,31 +387,33 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should fill remaining value if takerSellAmount > remaining makerBuyAmount', async () => {
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerSellAmount });
|
||||
it('should fill remaining value if takerTokenFillAmount > remaining takerTokenAmount', async () => {
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, { takerTokenFillAmount });
|
||||
|
||||
const res = await exWrapper.fillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount: signedOrder.makerBuyAmount,
|
||||
takerTokenFillAmount: signedOrder.takerTokenAmount,
|
||||
});
|
||||
const log = res.logs[0] as LogWithDecodedArgs<FillContractEventArgs>;
|
||||
expect(log.args.takerAmountSold).to.be.bignumber.equal(signedOrder.makerBuyAmount.minus(takerSellAmount));
|
||||
expect(log.args.takerTokenFilledAmount).to.be.bignumber.equal(
|
||||
signedOrder.takerTokenAmount.minus(takerTokenFillAmount),
|
||||
);
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
expect(newBalances[makerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(signedOrder.makerSellAmount),
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(signedOrder.makerTokenAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(signedOrder.makerBuyAmount),
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(signedOrder.takerTokenAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(signedOrder.makerFee),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(signedOrder.makerBuyAmount),
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(signedOrder.takerTokenAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(signedOrder.makerSellAmount),
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(signedOrder.makerTokenAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(signedOrder.takerFee),
|
||||
@@ -424,14 +426,14 @@ describe('Exchange', () => {
|
||||
it('should log 1 event with the correct arguments when order has a feeRecipient', async () => {
|
||||
const divisor = 2;
|
||||
const res = await exWrapper.fillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount: signedOrder.makerBuyAmount.div(divisor),
|
||||
takerTokenFillAmount: signedOrder.takerTokenAmount.div(divisor),
|
||||
});
|
||||
expect(res.logs).to.have.length(1);
|
||||
|
||||
const log = res.logs[0] as LogWithDecodedArgs<FillContractEventArgs>;
|
||||
const logArgs = log.args;
|
||||
const expectedFilledMakerTokenAmount = signedOrder.makerSellAmount.div(divisor);
|
||||
const expectedFilledTakerTokenAmount = signedOrder.makerBuyAmount.div(divisor);
|
||||
const expectedFilledMakerTokenAmount = signedOrder.makerTokenAmount.div(divisor);
|
||||
const expectedFilledTakerTokenAmount = signedOrder.takerTokenAmount.div(divisor);
|
||||
const expectedFeeMPaid = signedOrder.makerFee.div(divisor);
|
||||
const expectedFeeTPaid = signedOrder.takerFee.div(divisor);
|
||||
|
||||
@@ -440,8 +442,8 @@ describe('Exchange', () => {
|
||||
expect(signedOrder.feeRecipientAddress).to.be.equal(logArgs.feeRecipientAddress);
|
||||
expect(signedOrder.makerTokenAddress).to.be.equal(logArgs.makerTokenAddress);
|
||||
expect(signedOrder.takerTokenAddress).to.be.equal(logArgs.takerTokenAddress);
|
||||
expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.makerAmountSold);
|
||||
expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.takerAmountSold);
|
||||
expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.makerTokenFilledAmount);
|
||||
expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.takerTokenFilledAmount);
|
||||
expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.makerFeePaid);
|
||||
expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.takerFeePaid);
|
||||
expect(orderUtils.getOrderHashHex(signedOrder)).to.be.equal(logArgs.orderHash);
|
||||
@@ -453,14 +455,14 @@ describe('Exchange', () => {
|
||||
});
|
||||
const divisor = 2;
|
||||
const res = await exWrapper.fillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount: signedOrder.makerBuyAmount.div(divisor),
|
||||
takerTokenFillAmount: signedOrder.takerTokenAmount.div(divisor),
|
||||
});
|
||||
expect(res.logs).to.have.length(1);
|
||||
|
||||
const log = res.logs[0] as LogWithDecodedArgs<FillContractEventArgs>;
|
||||
const logArgs = log.args;
|
||||
const expectedFilledMakerTokenAmount = signedOrder.makerSellAmount.div(divisor);
|
||||
const expectedFilledTakerTokenAmount = signedOrder.makerBuyAmount.div(divisor);
|
||||
const expectedFilledMakerTokenAmount = signedOrder.makerTokenAmount.div(divisor);
|
||||
const expectedFilledTakerTokenAmount = signedOrder.takerTokenAmount.div(divisor);
|
||||
const expectedFeeMPaid = new BigNumber(0);
|
||||
const expectedFeeTPaid = new BigNumber(0);
|
||||
|
||||
@@ -469,8 +471,8 @@ describe('Exchange', () => {
|
||||
expect(signedOrder.feeRecipientAddress).to.be.equal(logArgs.feeRecipientAddress);
|
||||
expect(signedOrder.makerTokenAddress).to.be.equal(logArgs.makerTokenAddress);
|
||||
expect(signedOrder.takerTokenAddress).to.be.equal(logArgs.takerTokenAddress);
|
||||
expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.makerAmountSold);
|
||||
expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.takerAmountSold);
|
||||
expect(expectedFilledMakerTokenAmount).to.be.bignumber.equal(logArgs.makerTokenFilledAmount);
|
||||
expect(expectedFilledTakerTokenAmount).to.be.bignumber.equal(logArgs.takerTokenFilledAmount);
|
||||
expect(expectedFeeMPaid).to.be.bignumber.equal(logArgs.makerFeePaid);
|
||||
expect(expectedFeeTPaid).to.be.bignumber.equal(logArgs.takerFeePaid);
|
||||
expect(orderUtils.getOrderHashHex(signedOrder)).to.be.equal(logArgs.orderHash);
|
||||
@@ -479,15 +481,15 @@ describe('Exchange', () => {
|
||||
it('should throw when taker is specified and order is claimed by other', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
takerAddress: feeRecipientAddress,
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
});
|
||||
return expect(exWrapper.fillOrderAsync(signedOrder, takerAddress)).to.be.rejectedWith(constants.REVERT);
|
||||
});
|
||||
|
||||
it('should throw if signature is invalid', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(10), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(10), 18),
|
||||
});
|
||||
|
||||
const invalidR = ethUtil.sha3('invalidR');
|
||||
@@ -501,7 +503,7 @@ describe('Exchange', () => {
|
||||
|
||||
it('should throw if maker balances are too low to fill order', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
});
|
||||
|
||||
return expect(exWrapper.fillOrderAsync(signedOrder, takerAddress)).to.be.rejectedWith(constants.REVERT);
|
||||
@@ -509,7 +511,7 @@ describe('Exchange', () => {
|
||||
|
||||
it('should throw if taker balances are too low to fill order', async () => {
|
||||
signedOrder = orderFactory.newSignedOrder({
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
});
|
||||
|
||||
return expect(exWrapper.fillOrderAsync(signedOrder, takerAddress)).to.be.rejectedWith(constants.REVERT);
|
||||
@@ -582,7 +584,7 @@ describe('Exchange', () => {
|
||||
it('should be able to cancel a full order', async () => {
|
||||
await exWrapper.cancelOrderAsync(signedOrder, makerAddress);
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount: signedOrder.makerBuyAmount.div(2),
|
||||
takerTokenFillAmount: signedOrder.takerTokenAmount.div(2),
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -655,31 +657,31 @@ describe('Exchange', () => {
|
||||
balances = await dmyBalances.getAsync();
|
||||
const signedOrders = await Promise.all([
|
||||
orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(9), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(9), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(9), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(9), 18),
|
||||
salt: new BigNumber(0),
|
||||
}),
|
||||
orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(79), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(79), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(79), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(79), 18),
|
||||
salt: new BigNumber(1),
|
||||
}),
|
||||
orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(979), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(979), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(979), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(979), 18),
|
||||
salt: new BigNumber(2),
|
||||
}),
|
||||
orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(7979), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(7979), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(7979), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(7979), 18),
|
||||
salt: new BigNumber(3),
|
||||
}),
|
||||
]);
|
||||
await exWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress);
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
const fillMakerTokenAmount = signedOrders[2].makerSellAmount.add(signedOrders[3].makerSellAmount);
|
||||
const fillTakerTokenAmount = signedOrders[2].makerBuyAmount.add(signedOrders[3].makerBuyAmount);
|
||||
const fillMakerTokenAmount = signedOrders[2].makerTokenAmount.add(signedOrders[3].makerTokenAmount);
|
||||
const fillTakerTokenAmount = signedOrders[2].takerTokenAmount.add(signedOrders[3].takerTokenAmount);
|
||||
const makerFee = signedOrders[2].makerFee.add(signedOrders[3].makerFee);
|
||||
const takerFee = signedOrders[2].takerFee.add(signedOrders[3].takerFee);
|
||||
expect(newBalances[makerAddress][signedOrders[3].makerTokenAddress]).to.be.bignumber.equal(
|
||||
|
||||
@@ -52,8 +52,8 @@ describe('Exchange', () => {
|
||||
feeRecipientAddress,
|
||||
makerTokenAddress: rep.address,
|
||||
takerTokenAddress: dgd.address,
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
|
||||
takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
|
||||
};
|
||||
|
||||
@@ -80,8 +80,8 @@ describe('Exchange', () => {
|
||||
feeRecipientAddress,
|
||||
makerTokenAddress: rep.address,
|
||||
takerTokenAddress: dgd.address,
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
|
||||
takerFee: ZeroEx.toBaseUnitAmount(new BigNumber(1), 18),
|
||||
};
|
||||
@@ -114,39 +114,39 @@ describe('Exchange', () => {
|
||||
describe('fillOrKillOrder', () => {
|
||||
it('should transfer the correct amounts', async () => {
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
});
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
await exWrapper.fillOrKillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFee = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFee = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
expect(newBalances[makerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFee),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFee),
|
||||
@@ -166,11 +166,11 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should throw if entire takerSellAmount not filled', async () => {
|
||||
it('should throw if entire takerTokenFillAmount not filled', async () => {
|
||||
const signedOrder = orderFactory.newSignedOrder();
|
||||
|
||||
await exWrapper.fillOrderAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount: signedOrder.makerBuyAmount.div(2),
|
||||
takerTokenFillAmount: signedOrder.takerTokenAmount.div(2),
|
||||
});
|
||||
|
||||
return expect(exWrapper.fillOrKillOrderAsync(signedOrder, takerAddress)).to.be.rejectedWith(
|
||||
@@ -182,39 +182,39 @@ describe('Exchange', () => {
|
||||
describe('fillOrderNoThrow', () => {
|
||||
it('should transfer the correct amounts', async () => {
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(200), 18),
|
||||
});
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress, {
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFee = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFee = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
expect(newBalances[makerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrder.makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrder.takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFee),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrder.takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrder.makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrder.makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFee),
|
||||
@@ -226,7 +226,7 @@ describe('Exchange', () => {
|
||||
|
||||
it('should not change balances if maker balances are too low to fill order', async () => {
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
makerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
makerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
});
|
||||
|
||||
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
|
||||
@@ -236,7 +236,7 @@ describe('Exchange', () => {
|
||||
|
||||
it('should not change balances if taker balances are too low to fill order', async () => {
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
makerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
takerTokenAmount: ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18),
|
||||
});
|
||||
|
||||
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
|
||||
@@ -272,11 +272,11 @@ describe('Exchange', () => {
|
||||
expect(newBalances).to.be.deep.equal(balances);
|
||||
});
|
||||
|
||||
it('should not change balances if makerTokenAddress is ZRX, makerSellAmount + makerFee > maker balance', async () => {
|
||||
it('should not change balances if makerTokenAddress is ZRX, makerTokenAmount + makerFee > maker balance', async () => {
|
||||
const makerZRXBalance = new BigNumber(balances[makerAddress][zrx.address]);
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
makerTokenAddress: zrx.address,
|
||||
makerSellAmount: makerZRXBalance,
|
||||
makerTokenAmount: makerZRXBalance,
|
||||
makerFee: new BigNumber(1),
|
||||
});
|
||||
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
|
||||
@@ -284,11 +284,11 @@ describe('Exchange', () => {
|
||||
expect(newBalances).to.be.deep.equal(balances);
|
||||
});
|
||||
|
||||
it('should not change balances if makerTokenAddress is ZRX, makerSellAmount + makerFee > maker allowance', async () => {
|
||||
it('should not change balances if makerTokenAddress is ZRX, makerTokenAmount + makerFee > maker allowance', async () => {
|
||||
const makerZRXAllowance = await zrx.allowance.callAsync(makerAddress, tokenTransferProxy.address);
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
makerTokenAddress: zrx.address,
|
||||
makerSellAmount: new BigNumber(makerZRXAllowance),
|
||||
makerTokenAmount: new BigNumber(makerZRXAllowance),
|
||||
makerFee: new BigNumber(1),
|
||||
});
|
||||
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
|
||||
@@ -296,11 +296,11 @@ describe('Exchange', () => {
|
||||
expect(newBalances).to.be.deep.equal(balances);
|
||||
});
|
||||
|
||||
it('should not change balances if takerTokenAddress is ZRX, makerBuyAmount + takerFee > taker balance', async () => {
|
||||
it('should not change balances if takerTokenAddress is ZRX, takerTokenAmount + takerFee > taker balance', async () => {
|
||||
const takerZRXBalance = new BigNumber(balances[takerAddress][zrx.address]);
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
takerTokenAddress: zrx.address,
|
||||
makerBuyAmount: takerZRXBalance,
|
||||
takerTokenAmount: takerZRXBalance,
|
||||
takerFee: new BigNumber(1),
|
||||
});
|
||||
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
|
||||
@@ -308,11 +308,11 @@ describe('Exchange', () => {
|
||||
expect(newBalances).to.be.deep.equal(balances);
|
||||
});
|
||||
|
||||
it('should not change balances if takerTokenAddress is ZRX, makerBuyAmount + takerFee > taker allowance', async () => {
|
||||
it('should not change balances if takerTokenAddress is ZRX, takerTokenAmount + takerFee > taker allowance', async () => {
|
||||
const takerZRXAllowance = await zrx.allowance.callAsync(takerAddress, tokenTransferProxy.address);
|
||||
const signedOrder = orderFactory.newSignedOrder({
|
||||
takerTokenAddress: zrx.address,
|
||||
makerBuyAmount: new BigNumber(takerZRXAllowance),
|
||||
takerTokenAmount: new BigNumber(takerZRXAllowance),
|
||||
takerFee: new BigNumber(1),
|
||||
});
|
||||
await exWrapper.fillOrderNoThrowAsync(signedOrder, takerAddress);
|
||||
@@ -333,33 +333,33 @@ describe('Exchange', () => {
|
||||
|
||||
describe('batchFillOrders', () => {
|
||||
it('should transfer the correct amounts', async () => {
|
||||
const takerSellAmounts: BigNumber[] = [];
|
||||
const takerTokenFillAmounts: BigNumber[] = [];
|
||||
const makerTokenAddress = rep.address;
|
||||
const takerTokenAddress = dgd.address;
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFee = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFee = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
takerSellAmounts.push(takerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
takerTokenFillAmounts.push(takerTokenFillAmount);
|
||||
balances[makerAddress][makerTokenAddress] = balances[makerAddress][makerTokenAddress].minus(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[makerAddress][takerTokenAddress] = balances[makerAddress][takerTokenAddress].add(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(makerFee);
|
||||
balances[takerAddress][makerTokenAddress] = balances[takerAddress][makerTokenAddress].add(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[takerAddress][takerTokenAddress] = balances[takerAddress][takerTokenAddress].minus(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(takerFee);
|
||||
balances[feeRecipientAddress][zrx.address] = balances[feeRecipientAddress][zrx.address].add(
|
||||
@@ -368,7 +368,7 @@ describe('Exchange', () => {
|
||||
});
|
||||
|
||||
await exWrapper.batchFillOrdersAsync(signedOrders, takerAddress, {
|
||||
takerSellAmounts,
|
||||
takerTokenFillAmounts,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -378,33 +378,33 @@ describe('Exchange', () => {
|
||||
|
||||
describe('batchFillOrKillOrders', () => {
|
||||
it('should transfer the correct amounts', async () => {
|
||||
const takerSellAmounts: BigNumber[] = [];
|
||||
const takerTokenFillAmounts: BigNumber[] = [];
|
||||
const makerTokenAddress = rep.address;
|
||||
const takerTokenAddress = dgd.address;
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFee = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFee = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
takerSellAmounts.push(takerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
takerTokenFillAmounts.push(takerTokenFillAmount);
|
||||
balances[makerAddress][makerTokenAddress] = balances[makerAddress][makerTokenAddress].minus(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[makerAddress][takerTokenAddress] = balances[makerAddress][takerTokenAddress].add(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(makerFee);
|
||||
balances[takerAddress][makerTokenAddress] = balances[takerAddress][makerTokenAddress].add(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[takerAddress][takerTokenAddress] = balances[takerAddress][takerTokenAddress].minus(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(takerFee);
|
||||
balances[feeRecipientAddress][zrx.address] = balances[feeRecipientAddress][zrx.address].add(
|
||||
@@ -413,7 +413,7 @@ describe('Exchange', () => {
|
||||
});
|
||||
|
||||
await exWrapper.batchFillOrKillOrdersAsync(signedOrders, takerAddress, {
|
||||
takerSellAmounts,
|
||||
takerTokenFillAmounts,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -421,17 +421,17 @@ describe('Exchange', () => {
|
||||
});
|
||||
|
||||
it('should throw if a single signedOrder does not fill the expected amount', async () => {
|
||||
const takerSellAmounts: BigNumber[] = [];
|
||||
const takerTokenFillAmounts: BigNumber[] = [];
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
takerSellAmounts.push(takerSellAmount);
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
takerTokenFillAmounts.push(takerTokenFillAmount);
|
||||
});
|
||||
|
||||
await exWrapper.fillOrKillOrderAsync(signedOrders[0], takerAddress);
|
||||
|
||||
return expect(
|
||||
exWrapper.batchFillOrKillOrdersAsync(signedOrders, takerAddress, {
|
||||
takerSellAmounts,
|
||||
takerTokenFillAmounts,
|
||||
}),
|
||||
).to.be.rejectedWith(constants.REVERT);
|
||||
});
|
||||
@@ -439,33 +439,33 @@ describe('Exchange', () => {
|
||||
|
||||
describe('batchFillOrdersNoThrow', async () => {
|
||||
it('should transfer the correct amounts', async () => {
|
||||
const takerSellAmounts: BigNumber[] = [];
|
||||
const takerTokenFillAmounts: BigNumber[] = [];
|
||||
const makerTokenAddress = rep.address;
|
||||
const takerTokenAddress = dgd.address;
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFee = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFee = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
takerSellAmounts.push(takerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
takerTokenFillAmounts.push(takerTokenFillAmount);
|
||||
balances[makerAddress][makerTokenAddress] = balances[makerAddress][makerTokenAddress].minus(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[makerAddress][takerTokenAddress] = balances[makerAddress][takerTokenAddress].add(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(makerFee);
|
||||
balances[takerAddress][makerTokenAddress] = balances[takerAddress][makerTokenAddress].add(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[takerAddress][takerTokenAddress] = balances[takerAddress][takerTokenAddress].minus(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(takerFee);
|
||||
balances[feeRecipientAddress][zrx.address] = balances[feeRecipientAddress][zrx.address].add(
|
||||
@@ -474,7 +474,7 @@ describe('Exchange', () => {
|
||||
});
|
||||
|
||||
await exWrapper.batchFillOrdersNoThrowAsync(signedOrders, takerAddress, {
|
||||
takerSellAmounts,
|
||||
takerTokenFillAmounts,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -482,7 +482,7 @@ describe('Exchange', () => {
|
||||
});
|
||||
|
||||
it('should not throw if an order is invalid and fill the remaining orders', async () => {
|
||||
const takerSellAmounts: BigNumber[] = [];
|
||||
const takerTokenFillAmounts: BigNumber[] = [];
|
||||
const makerTokenAddress = rep.address;
|
||||
const takerTokenAddress = dgd.address;
|
||||
|
||||
@@ -492,31 +492,31 @@ describe('Exchange', () => {
|
||||
};
|
||||
const validOrders = signedOrders.slice(1);
|
||||
|
||||
takerSellAmounts.push(invalidOrder.makerBuyAmount.div(2));
|
||||
takerTokenFillAmounts.push(invalidOrder.takerTokenAmount.div(2));
|
||||
_.forEach(validOrders, signedOrder => {
|
||||
const takerSellAmount = signedOrder.makerBuyAmount.div(2);
|
||||
const makerAmountSold = takerSellAmount
|
||||
.times(signedOrder.makerSellAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerBuyAmount);
|
||||
const takerTokenFillAmount = signedOrder.takerTokenAmount.div(2);
|
||||
const makerTokenFilledAmount = takerTokenFillAmount
|
||||
.times(signedOrder.makerTokenAmount)
|
||||
.dividedToIntegerBy(signedOrder.takerTokenAmount);
|
||||
const makerFee = signedOrder.makerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
const takerFee = signedOrder.takerFee
|
||||
.times(makerAmountSold)
|
||||
.dividedToIntegerBy(signedOrder.makerSellAmount);
|
||||
takerSellAmounts.push(takerSellAmount);
|
||||
.times(makerTokenFilledAmount)
|
||||
.dividedToIntegerBy(signedOrder.makerTokenAmount);
|
||||
takerTokenFillAmounts.push(takerTokenFillAmount);
|
||||
balances[makerAddress][makerTokenAddress] = balances[makerAddress][makerTokenAddress].minus(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[makerAddress][takerTokenAddress] = balances[makerAddress][takerTokenAddress].add(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(makerFee);
|
||||
balances[takerAddress][makerTokenAddress] = balances[takerAddress][makerTokenAddress].add(
|
||||
makerAmountSold,
|
||||
makerTokenFilledAmount,
|
||||
);
|
||||
balances[takerAddress][takerTokenAddress] = balances[takerAddress][takerTokenAddress].minus(
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(takerFee);
|
||||
balances[feeRecipientAddress][zrx.address] = balances[feeRecipientAddress][zrx.address].add(
|
||||
@@ -526,7 +526,7 @@ describe('Exchange', () => {
|
||||
|
||||
const newOrders = [invalidOrder, ...validOrders];
|
||||
await exWrapper.batchFillOrdersNoThrowAsync(newOrders, takerAddress, {
|
||||
takerSellAmounts,
|
||||
takerTokenFillAmounts,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -535,33 +535,35 @@ describe('Exchange', () => {
|
||||
});
|
||||
|
||||
describe('marketSellOrders', () => {
|
||||
it('should stop when the entire takerSellAmount is filled', async () => {
|
||||
const takerSellAmount = signedOrders[0].makerBuyAmount.plus(signedOrders[1].makerBuyAmount.div(2));
|
||||
it('should stop when the entire takerTokenFillAmount is filled', async () => {
|
||||
const takerTokenFillAmount = signedOrders[0].takerTokenAmount.plus(
|
||||
signedOrders[1].takerTokenAmount.div(2),
|
||||
);
|
||||
await exWrapper.marketSellOrdersAsync(signedOrders, takerAddress, {
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = signedOrders[0].makerSellAmount.add(
|
||||
signedOrders[1].makerSellAmount.dividedToIntegerBy(2),
|
||||
const makerTokenFilledAmount = signedOrders[0].makerTokenAmount.add(
|
||||
signedOrders[1].makerTokenAmount.dividedToIntegerBy(2),
|
||||
);
|
||||
const makerFee = signedOrders[0].makerFee.add(signedOrders[1].makerFee.dividedToIntegerBy(2));
|
||||
const takerFee = signedOrders[0].takerFee.add(signedOrders[1].takerFee.dividedToIntegerBy(2));
|
||||
expect(newBalances[makerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrders[0].takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrders[0].takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFee),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrders[0].takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrders[0].takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrders[0].takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFee),
|
||||
@@ -571,24 +573,24 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should fill all signedOrders if cannot fill entire takerSellAmount', async () => {
|
||||
const takerSellAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
it('should fill all signedOrders if cannot fill entire takerTokenFillAmount', async () => {
|
||||
const takerTokenFillAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
balances[makerAddress][signedOrder.makerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].minus(signedOrder.makerSellAmount);
|
||||
].minus(signedOrder.makerTokenAmount);
|
||||
balances[makerAddress][signedOrder.takerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].add(signedOrder.makerBuyAmount);
|
||||
].add(signedOrder.takerTokenAmount);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(
|
||||
signedOrder.makerFee,
|
||||
);
|
||||
balances[takerAddress][signedOrder.makerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].add(signedOrder.makerSellAmount);
|
||||
].add(signedOrder.makerTokenAmount);
|
||||
balances[takerAddress][signedOrder.takerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].minus(signedOrder.makerBuyAmount);
|
||||
].minus(signedOrder.takerTokenAmount);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(
|
||||
signedOrder.takerFee,
|
||||
);
|
||||
@@ -597,7 +599,7 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
await exWrapper.marketSellOrdersAsync(signedOrders, takerAddress, {
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -613,40 +615,42 @@ describe('Exchange', () => {
|
||||
|
||||
return expect(
|
||||
exWrapper.marketSellOrdersAsync(signedOrders, takerAddress, {
|
||||
takerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
takerTokenFillAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
}),
|
||||
).to.be.rejectedWith(constants.REVERT);
|
||||
});
|
||||
});
|
||||
|
||||
describe('marketSellOrdersNoThrow', () => {
|
||||
it('should stop when the entire takerSellAmount is filled', async () => {
|
||||
const takerSellAmount = signedOrders[0].makerBuyAmount.plus(signedOrders[1].makerBuyAmount.div(2));
|
||||
it('should stop when the entire takerTokenFillAmount is filled', async () => {
|
||||
const takerTokenFillAmount = signedOrders[0].takerTokenAmount.plus(
|
||||
signedOrders[1].takerTokenAmount.div(2),
|
||||
);
|
||||
await exWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountSold = signedOrders[0].makerSellAmount.add(
|
||||
signedOrders[1].makerSellAmount.dividedToIntegerBy(2),
|
||||
const makerTokenFilledAmount = signedOrders[0].makerTokenAmount.add(
|
||||
signedOrders[1].makerTokenAmount.dividedToIntegerBy(2),
|
||||
);
|
||||
const makerFee = signedOrders[0].makerFee.add(signedOrders[1].makerFee.dividedToIntegerBy(2));
|
||||
const takerFee = signedOrders[0].takerFee.add(signedOrders[1].takerFee.dividedToIntegerBy(2));
|
||||
expect(newBalances[makerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(makerAmountSold),
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrders[0].takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].takerTokenAddress].add(takerSellAmount),
|
||||
balances[makerAddress][signedOrders[0].takerTokenAddress].add(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[makerAddress][zrx.address].minus(makerFee),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrders[0].takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrders[0].takerTokenAddress].minus(takerSellAmount),
|
||||
balances[takerAddress][signedOrders[0].takerTokenAddress].minus(takerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(makerAmountSold),
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(makerTokenFilledAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFee),
|
||||
@@ -656,24 +660,24 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should fill all signedOrders if cannot fill entire takerSellAmount', async () => {
|
||||
const takerSellAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
it('should fill all signedOrders if cannot fill entire takerTokenFillAmount', async () => {
|
||||
const takerTokenFillAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
balances[makerAddress][signedOrder.makerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].minus(signedOrder.makerSellAmount);
|
||||
].minus(signedOrder.makerTokenAmount);
|
||||
balances[makerAddress][signedOrder.takerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].add(signedOrder.makerBuyAmount);
|
||||
].add(signedOrder.takerTokenAmount);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(
|
||||
signedOrder.makerFee,
|
||||
);
|
||||
balances[takerAddress][signedOrder.makerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].add(signedOrder.makerSellAmount);
|
||||
].add(signedOrder.makerTokenAmount);
|
||||
balances[takerAddress][signedOrder.takerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].minus(signedOrder.makerBuyAmount);
|
||||
].minus(signedOrder.takerTokenAmount);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(
|
||||
signedOrder.takerFee,
|
||||
);
|
||||
@@ -682,7 +686,7 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
await exWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -698,28 +702,30 @@ describe('Exchange', () => {
|
||||
|
||||
return expect(
|
||||
exWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
|
||||
takerSellAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
takerTokenFillAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
}),
|
||||
).to.be.rejectedWith(constants.REVERT);
|
||||
});
|
||||
});
|
||||
|
||||
describe('marketBuyOrders', () => {
|
||||
it('should stop when the entire takerBuyAmount is filled', async () => {
|
||||
const takerBuyAmount = signedOrders[0].makerSellAmount.plus(signedOrders[1].makerSellAmount.div(2));
|
||||
it('should stop when the entire makerTokenFillAmount is filled', async () => {
|
||||
const makerTokenFillAmount = signedOrders[0].makerTokenAmount.plus(
|
||||
signedOrders[1].makerTokenAmount.div(2),
|
||||
);
|
||||
await exWrapper.marketBuyOrdersAsync(signedOrders, takerAddress, {
|
||||
takerBuyAmount,
|
||||
makerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountBought = signedOrders[0].makerBuyAmount.add(
|
||||
signedOrders[1].makerBuyAmount.dividedToIntegerBy(2),
|
||||
const makerAmountBought = signedOrders[0].takerTokenAmount.add(
|
||||
signedOrders[1].takerTokenAmount.dividedToIntegerBy(2),
|
||||
);
|
||||
const makerFee = signedOrders[0].makerFee.add(signedOrders[1].makerFee.dividedToIntegerBy(2));
|
||||
const takerFee = signedOrders[0].takerFee.add(signedOrders[1].takerFee.dividedToIntegerBy(2));
|
||||
expect(newBalances[makerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(takerBuyAmount),
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(makerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrders[0].takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].takerTokenAddress].add(makerAmountBought),
|
||||
@@ -731,7 +737,7 @@ describe('Exchange', () => {
|
||||
balances[takerAddress][signedOrders[0].takerTokenAddress].minus(makerAmountBought),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(takerBuyAmount),
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(makerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFee),
|
||||
@@ -741,24 +747,24 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should fill all signedOrders if cannot fill entire takerBuyAmount', async () => {
|
||||
const takerBuyAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
it('should fill all signedOrders if cannot fill entire makerTokenFillAmount', async () => {
|
||||
const makerTokenFillAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
balances[makerAddress][signedOrder.makerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].minus(signedOrder.makerSellAmount);
|
||||
].minus(signedOrder.makerTokenAmount);
|
||||
balances[makerAddress][signedOrder.takerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].add(signedOrder.makerBuyAmount);
|
||||
].add(signedOrder.takerTokenAmount);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(
|
||||
signedOrder.makerFee,
|
||||
);
|
||||
balances[takerAddress][signedOrder.makerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].add(signedOrder.makerSellAmount);
|
||||
].add(signedOrder.makerTokenAmount);
|
||||
balances[takerAddress][signedOrder.takerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].minus(signedOrder.makerBuyAmount);
|
||||
].minus(signedOrder.takerTokenAmount);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(
|
||||
signedOrder.takerFee,
|
||||
);
|
||||
@@ -767,7 +773,7 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
await exWrapper.marketBuyOrdersAsync(signedOrders, takerAddress, {
|
||||
takerBuyAmount,
|
||||
makerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -783,28 +789,30 @@ describe('Exchange', () => {
|
||||
|
||||
return expect(
|
||||
exWrapper.marketBuyOrdersAsync(signedOrders, takerAddress, {
|
||||
takerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
makerTokenFillAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
}),
|
||||
).to.be.rejectedWith(constants.REVERT);
|
||||
});
|
||||
});
|
||||
|
||||
describe('marketBuyOrdersNoThrow', () => {
|
||||
it('should stop when the entire takerBuyAmount is filled', async () => {
|
||||
const takerBuyAmount = signedOrders[0].makerSellAmount.plus(signedOrders[1].makerSellAmount.div(2));
|
||||
it('should stop when the entire makerTokenFillAmount is filled', async () => {
|
||||
const makerTokenFillAmount = signedOrders[0].makerTokenAmount.plus(
|
||||
signedOrders[1].makerTokenAmount.div(2),
|
||||
);
|
||||
await exWrapper.marketBuyOrdersNoThrowAsync(signedOrders, takerAddress, {
|
||||
takerBuyAmount,
|
||||
makerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
|
||||
const makerAmountBought = signedOrders[0].makerBuyAmount.add(
|
||||
signedOrders[1].makerBuyAmount.dividedToIntegerBy(2),
|
||||
const makerAmountBought = signedOrders[0].takerTokenAmount.add(
|
||||
signedOrders[1].takerTokenAmount.dividedToIntegerBy(2),
|
||||
);
|
||||
const makerFee = signedOrders[0].makerFee.add(signedOrders[1].makerFee.dividedToIntegerBy(2));
|
||||
const takerFee = signedOrders[0].takerFee.add(signedOrders[1].takerFee.dividedToIntegerBy(2));
|
||||
expect(newBalances[makerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(takerBuyAmount),
|
||||
balances[makerAddress][signedOrders[0].makerTokenAddress].minus(makerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[makerAddress][signedOrders[0].takerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[makerAddress][signedOrders[0].takerTokenAddress].add(makerAmountBought),
|
||||
@@ -816,7 +824,7 @@ describe('Exchange', () => {
|
||||
balances[takerAddress][signedOrders[0].takerTokenAddress].minus(makerAmountBought),
|
||||
);
|
||||
expect(newBalances[takerAddress][signedOrders[0].makerTokenAddress]).to.be.bignumber.equal(
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(takerBuyAmount),
|
||||
balances[takerAddress][signedOrders[0].makerTokenAddress].add(makerTokenFillAmount),
|
||||
);
|
||||
expect(newBalances[takerAddress][zrx.address]).to.be.bignumber.equal(
|
||||
balances[takerAddress][zrx.address].minus(takerFee),
|
||||
@@ -826,24 +834,24 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
|
||||
it('should fill all signedOrders if cannot fill entire takerSellAmount', async () => {
|
||||
const takerSellAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
it('should fill all signedOrders if cannot fill entire takerTokenFillAmount', async () => {
|
||||
const takerTokenFillAmount = ZeroEx.toBaseUnitAmount(new BigNumber(100000), 18);
|
||||
_.forEach(signedOrders, signedOrder => {
|
||||
balances[makerAddress][signedOrder.makerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].minus(signedOrder.makerSellAmount);
|
||||
].minus(signedOrder.makerTokenAmount);
|
||||
balances[makerAddress][signedOrder.takerTokenAddress] = balances[makerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].add(signedOrder.makerBuyAmount);
|
||||
].add(signedOrder.takerTokenAmount);
|
||||
balances[makerAddress][zrx.address] = balances[makerAddress][zrx.address].minus(
|
||||
signedOrder.makerFee,
|
||||
);
|
||||
balances[takerAddress][signedOrder.makerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.makerTokenAddress
|
||||
].add(signedOrder.makerSellAmount);
|
||||
].add(signedOrder.makerTokenAmount);
|
||||
balances[takerAddress][signedOrder.takerTokenAddress] = balances[takerAddress][
|
||||
signedOrder.takerTokenAddress
|
||||
].minus(signedOrder.makerBuyAmount);
|
||||
].minus(signedOrder.takerTokenAmount);
|
||||
balances[takerAddress][zrx.address] = balances[takerAddress][zrx.address].minus(
|
||||
signedOrder.takerFee,
|
||||
);
|
||||
@@ -852,7 +860,7 @@ describe('Exchange', () => {
|
||||
);
|
||||
});
|
||||
await exWrapper.marketSellOrdersNoThrowAsync(signedOrders, takerAddress, {
|
||||
takerSellAmount,
|
||||
takerTokenFillAmount,
|
||||
});
|
||||
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
@@ -868,7 +876,7 @@ describe('Exchange', () => {
|
||||
|
||||
return expect(
|
||||
exWrapper.marketBuyOrdersNoThrowAsync(signedOrders, takerAddress, {
|
||||
takerBuyAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
makerTokenFillAmount: ZeroEx.toBaseUnitAmount(new BigNumber(1000), 18),
|
||||
}),
|
||||
).to.be.rejectedWith(constants.REVERT);
|
||||
});
|
||||
@@ -876,11 +884,11 @@ describe('Exchange', () => {
|
||||
|
||||
describe('batchCancelOrders', () => {
|
||||
it('should be able to cancel multiple signedOrders', async () => {
|
||||
const takerTokenCancelAmounts = _.map(signedOrders, signedOrder => signedOrder.makerBuyAmount);
|
||||
const takerTokenCancelAmounts = _.map(signedOrders, signedOrder => signedOrder.takerTokenAmount);
|
||||
await exWrapper.batchCancelOrdersAsync(signedOrders, makerAddress);
|
||||
|
||||
await exWrapper.batchFillOrdersAsync(signedOrders, takerAddress, {
|
||||
takerSellAmounts: takerTokenCancelAmounts,
|
||||
takerTokenFillAmounts: takerTokenCancelAmounts,
|
||||
});
|
||||
const newBalances = await dmyBalances.getAsync();
|
||||
expect(balances).to.be.deep.equal(newBalances);
|
||||
|
||||
Reference in New Issue
Block a user