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

Make zeroEx.getOrderHashHex non-async

Browse Source
This commit is contained in:
Leonid Logvinov
2017-06-29 12:54:41 -07:00
parent e1e79519b9
commit fa3963199e
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
test/exchange_wrapper_test.ts
View File

@@ -394,11 +394,11 @@ describe('ExchangeWrapper', () => {
signedOrder = await fillScenarios.createFillableSignedOrderAsync( signedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
); );
signedOrderHashHex = await zeroEx.getOrderHashHexAsync(signedOrder); signedOrderHashHex = zeroEx.getOrderHashHex(signedOrder);
anotherSignedOrder = await fillScenarios.createFillableSignedOrderAsync( anotherSignedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
); );
anotherOrderHashHex = await zeroEx.getOrderHashHexAsync(anotherSignedOrder); anotherOrderHashHex = zeroEx.getOrderHashHex(anotherSignedOrder);
orderFillBatch = [ orderFillBatch = [
{ {
signedOrder, signedOrder,
@@ -438,11 +438,11 @@ describe('ExchangeWrapper', () => {
signedOrder = await fillScenarios.createFillableSignedOrderAsync( signedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
); );
signedOrderHashHex = await zeroEx.getOrderHashHexAsync(signedOrder); signedOrderHashHex = zeroEx.getOrderHashHex(signedOrder);
anotherSignedOrder = await fillScenarios.createFillableSignedOrderAsync( anotherSignedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
); );
anotherOrderHashHex = await zeroEx.getOrderHashHexAsync(anotherSignedOrder); anotherOrderHashHex = zeroEx.getOrderHashHex(anotherSignedOrder);
signedOrders = [signedOrder, anotherSignedOrder]; signedOrders = [signedOrder, anotherSignedOrder];
}); });
describe('successful batch fills', () => { describe('successful batch fills', () => {
@@ -490,7 +490,7 @@ describe('ExchangeWrapper', () => {
signedOrder = await fillScenarios.createFillableSignedOrderAsync( signedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
); );
orderHashHex = await zeroEx.getOrderHashHexAsync(signedOrder); orderHashHex = zeroEx.getOrderHashHex(signedOrder);
}); });
describe('#cancelOrderAsync', () => { describe('#cancelOrderAsync', () => {
describe('failed cancels', () => { describe('failed cancels', () => {
@@ -505,7 +505,7 @@ describe('ExchangeWrapper', () => {
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress,
fillableAmount, expirationInPast, fillableAmount, expirationInPast,
); );
orderHashHex = await zeroEx.getOrderHashHexAsync(expiredSignedOrder); orderHashHex = zeroEx.getOrderHashHex(expiredSignedOrder);
return expect(zeroEx.exchange.cancelOrderAsync(expiredSignedOrder, cancelAmount)) return expect(zeroEx.exchange.cancelOrderAsync(expiredSignedOrder, cancelAmount))
.to.be.rejectedWith(ExchangeContractErrs.ORDER_CANCEL_EXPIRED); .to.be.rejectedWith(ExchangeContractErrs.ORDER_CANCEL_EXPIRED);
}); });
@@ -537,7 +537,7 @@ describe('ExchangeWrapper', () => {
anotherSignedOrder = await fillScenarios.createFillableSignedOrderAsync( anotherSignedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
); );
anotherOrderHashHex = await zeroEx.getOrderHashHexAsync(anotherSignedOrder); anotherOrderHashHex = zeroEx.getOrderHashHex(anotherSignedOrder);
cancelBatch = [ cancelBatch = [
{ {
order: signedOrder, order: signedOrder,
@@ -598,7 +598,7 @@ describe('ExchangeWrapper', () => {
signedOrder = await fillScenarios.createPartiallyFilledSignedOrderAsync( signedOrder = await fillScenarios.createPartiallyFilledSignedOrderAsync(
makerTokenAddress, takerTokenAddress, takerAddress, fillableAmount, partialFillAmount, makerTokenAddress, takerTokenAddress, takerAddress, fillableAmount, partialFillAmount,
); );
orderHash = await zeroEx.getOrderHashHexAsync(signedOrder); orderHash = zeroEx.getOrderHashHex(signedOrder);
}); });
describe('#getUnavailableTakerAmountAsync', () => { describe('#getUnavailableTakerAmountAsync', () => {
it ('should throw if passed an invalid orderHash', async () => { it ('should throw if passed an invalid orderHash', async () => {
@@ -805,7 +805,7 @@ describe('ExchangeWrapper', () => {
const signedOrder = await fillScenarios.createFillableSignedOrderAsync( const signedOrder = await fillScenarios.createFillableSignedOrderAsync(
makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount, makerTokenAddress, takerTokenAddress, makerAddress, takerAddress, fillableAmount,
); );
const orderHash = await zeroEx.getOrderHashHexAsync(signedOrder); const orderHash = zeroEx.getOrderHashHex(signedOrder);
const orderHashFromContract = await (zeroEx.exchange as any) const orderHashFromContract = await (zeroEx.exchange as any)
._getOrderHashHexUsingContractCallAsync(signedOrder); ._getOrderHashHexUsingContractCallAsync(signedOrder);
expect(orderHash).to.equal(orderHashFromContract); expect(orderHash).to.equal(orderHashFromContract);

2
test/utils/order_factory.ts
View File

@@ -34,7 +34,7 @@ export const orderFactory = {
feeRecipient, feeRecipient,
expirationUnixTimestampSec, expirationUnixTimestampSec,
}; };
const orderHash = await zeroEx.getOrderHashHexAsync(order); const orderHash = zeroEx.getOrderHashHex(order);
const ecSignature = await zeroEx.signOrderHashAsync(orderHash, maker); const ecSignature = await zeroEx.signOrderHashAsync(orderHash, maker);
const signedOrder: SignedOrder = _.assign(order, {ecSignature}); const signedOrder: SignedOrder = _.assign(order, {ecSignature});
return signedOrder; return signedOrder;