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

Fix tests

Browse Source
This commit is contained in:
fragosti 2019-09-25 18:24:55 -07:00
parent 8ba38b9b29
commit 470643ee07
7 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/asset-buyer/test/asset_buyer_test.ts
View File

@ -102,14 +102,17 @@ describe('AssetBuyer', () => {
// TODO (xianny): needs to be updated to new SignedOrder interface // TODO (xianny): needs to be updated to new SignedOrder interface
describe('assetData is supported', () => { describe('assetData is supported', () => {
const chainId = 1;
// orders // orders
const sellTwoTokensFor1Weth: SignedOrder = orderFactory.createSignedOrderFromPartial({ const sellTwoTokensFor1Weth: SignedOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: baseUnitAmount(2), makerAssetAmount: baseUnitAmount(2),
takerAssetAmount: baseUnitAmount(1, WETH_DECIMALS), takerAssetAmount: baseUnitAmount(1, WETH_DECIMALS),
chainId,
}); });
const sellTenTokensFor10Weth: SignedOrder = orderFactory.createSignedOrderFromPartial({ const sellTenTokensFor10Weth: SignedOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: baseUnitAmount(10), makerAssetAmount: baseUnitAmount(10),
takerAssetAmount: baseUnitAmount(10, WETH_DECIMALS), takerAssetAmount: baseUnitAmount(10, WETH_DECIMALS),
chainId,
}); });
beforeEach(() => { beforeEach(() => {

8
packages/asset-buyer/test/buy_quote_calculator_test.ts
View File

@ -24,6 +24,7 @@ describe('buyQuoteCalculator', () => {
let ordersAndFillableAmounts: OrdersAndFillableAmounts; let ordersAndFillableAmounts: OrdersAndFillableAmounts;
let smallFeeOrderAndFillableAmount: OrdersAndFillableAmounts; let smallFeeOrderAndFillableAmount: OrdersAndFillableAmounts;
let allFeeOrdersAndFillableAmounts: OrdersAndFillableAmounts; let allFeeOrdersAndFillableAmounts: OrdersAndFillableAmounts;
const chainId = 1;
beforeEach(() => { beforeEach(() => {
// generate two orders for our desired maker asset // generate two orders for our desired maker asset
// the first order has a rate of 4 makerAsset / WETH with a takerFee of 200 ZRX and has only 200 / 400 makerAsset units left to fill (half fillable) // the first order has a rate of 4 makerAsset / WETH with a takerFee of 200 ZRX and has only 200 / 400 makerAsset units left to fill (half fillable)
@ -34,12 +35,14 @@ describe('buyQuoteCalculator', () => {
makerAssetAmount: new BigNumber(400), makerAssetAmount: new BigNumber(400),
takerAssetAmount: new BigNumber(100), takerAssetAmount: new BigNumber(100),
takerFee: new BigNumber(200), takerFee: new BigNumber(200),
chainId,
}); });
firstRemainingFillAmount = new BigNumber(200); firstRemainingFillAmount = new BigNumber(200);
secondOrder = orderFactory.createSignedOrderFromPartial({ secondOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: new BigNumber(200), makerAssetAmount: new BigNumber(200),
takerAssetAmount: new BigNumber(100), takerAssetAmount: new BigNumber(100),
takerFee: new BigNumber(100), takerFee: new BigNumber(100),
chainId,
}); });
secondRemainingFillAmount = secondOrder.makerAssetAmount; secondRemainingFillAmount = secondOrder.makerAssetAmount;
ordersAndFillableAmounts = { ordersAndFillableAmounts = {
@ -49,6 +52,7 @@ describe('buyQuoteCalculator', () => {
const smallFeeOrder = orderFactory.createSignedOrderFromPartial({ const smallFeeOrder = orderFactory.createSignedOrderFromPartial({
makerAssetAmount: new BigNumber(100), makerAssetAmount: new BigNumber(100),
takerAssetAmount: new BigNumber(100), takerAssetAmount: new BigNumber(100),
chainId,
}); });
smallFeeOrderAndFillableAmount = { smallFeeOrderAndFillableAmount = {
orders: [smallFeeOrder], orders: [smallFeeOrder],
@ -58,6 +62,7 @@ describe('buyQuoteCalculator', () => {
makerAssetAmount: new BigNumber(113), makerAssetAmount: new BigNumber(113),
takerAssetAmount: new BigNumber(200), takerAssetAmount: new BigNumber(200),
takerFee: new BigNumber(11), takerFee: new BigNumber(11),
chainId,
}); });
allFeeOrdersAndFillableAmounts = { allFeeOrdersAndFillableAmounts = {
orders: [smallFeeOrder, largeFeeOrder], orders: [smallFeeOrder, largeFeeOrder],
@ -133,6 +138,7 @@ describe('buyQuoteCalculator', () => {
makerAssetAmount: new BigNumber(123), makerAssetAmount: new BigNumber(123),
takerAssetAmount: new BigNumber(100), takerAssetAmount: new BigNumber(100),
takerFee: new BigNumber(200), takerFee: new BigNumber(200),
chainId,
}); });
const completelyFillableOrdersAndFillableAmount: OrdersAndFillableAmounts = { const completelyFillableOrdersAndFillableAmount: OrdersAndFillableAmounts = {
orders: [completelyFillableOrder], orders: [completelyFillableOrder],
@ -155,6 +161,7 @@ describe('buyQuoteCalculator', () => {
makerAssetAmount: new BigNumber(1), makerAssetAmount: new BigNumber(1),
takerAssetAmount: new BigNumber(1), takerAssetAmount: new BigNumber(1),
takerFee: new BigNumber(0), takerFee: new BigNumber(0),
chainId,
}); });
const errorFunction = () => { const errorFunction = () => {
buyQuoteCalculator.calculate( buyQuoteCalculator.calculate(
@ -173,6 +180,7 @@ describe('buyQuoteCalculator', () => {
makerAssetAmount: new BigNumber(1), makerAssetAmount: new BigNumber(1),
takerAssetAmount: new BigNumber(1), takerAssetAmount: new BigNumber(1),
takerFee: new BigNumber(0), takerFee: new BigNumber(0),
chainId,
}); });
const errorFunction = () => { const errorFunction = () => {
buyQuoteCalculator.calculate( buyQuoteCalculator.calculate(

5
packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.json vendored
View File

@ -12,8 +12,11 @@
"salt": "1532559225", "salt": "1532559225",
"makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d", "makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990", "takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"makerFeeAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"takerFeeAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093", "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
"signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33" "signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33",
"chainId": 1
}, },
"metaData": {} "metaData": {}
} }

3
packages/connect/test/fixtures/standard_relayer_api/order/0xabc67323774bdbd24d94f977fa9ac94a50f016026fd13f42990861238897721f.ts vendored
View File

@ -14,8 +14,11 @@ export const orderResponse = {
salt: new BigNumber('1532559225'), salt: new BigNumber('1532559225'),
makerAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d', makerAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
takerAssetData: '0x0257179264389b814a946f3e92105513705ca6b990', takerAssetData: '0x0257179264389b814a946f3e92105513705ca6b990',
makerFeeAssetData: '0xf47261b04c32345ced77393b3530b1eed0f346429d',
takerFeeAssetData: '0x0257179264389b814a946f3e92105513705ca6b990',
exchangeAddress: '0x12459c951127e0c374ff9105dda097662a027093', exchangeAddress: '0x12459c951127e0c374ff9105dda097662a027093',
signature: '0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33', signature: '0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33',
chainId: 1,
}, },
metaData: {}, metaData: {},
}; };

10
packages/connect/test/fixtures/standard_relayer_api/orderbook.json vendored
View File

@ -18,8 +18,11 @@
"salt": "1532559225", "salt": "1532559225",
"makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d", "makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990", "takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"makerFeeAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"takerFeeAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093", "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
"signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33" "signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33",
"chainId": 1
}, },
"metaData": {} "metaData": {}
} }
@ -44,8 +47,11 @@
"salt": "1532559225", "salt": "1532559225",
"makerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990", "makerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"takerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d", "takerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"makerFeeAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"takerFeeAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093", "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
"signature": "0x013842a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b3518891" "signature": "0x013842a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b3518891",
"chainId": 1
}, },
"metaData": {} "metaData": {}
} }

5
packages/connect/test/fixtures/standard_relayer_api/orders.json vendored
View File

@ -17,8 +17,11 @@
"salt": "1532559225", "salt": "1532559225",
"makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d", "makerAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990", "takerAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"makerFeeAssetData": "0xf47261b04c32345ced77393b3530b1eed0f346429d",
"takerFeeAssetData": "0x0257179264389b814a946f3e92105513705ca6b990",
"exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093", "exchangeAddress": "0x12459c951127e0c374ff9105dda097662a027093",
"signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33" "signature": "0x012761a3ed31b43c8780e905a260a35faefcc527be7516aa11c0256729b5b351bc33",
"chainId": 1
}, },
"metaData": {} "metaData": {}
} }

5
packages/orderbook/test/utils.test.ts
View File

@ -10,12 +10,15 @@ describe('Utils', () => {
takerAddress: '0x0000000000000000000000000000000000000000', takerAddress: '0x0000000000000000000000000000000000000000',
takerAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2', takerAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
takerAssetAmount: '1000000000000000061', takerAssetAmount: '1000000000000000061',
makerFeeAssetData: '0xf47261b00000000000000000000000000f5d2fb29fb7d3cfee444a200298f468908cc942',
takerFeeAssetData: '0xf47261b0000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2',
takerFee: '0', takerFee: '0',
senderAddress: '0x0000000000000000000000000000000000000000', senderAddress: '0x0000000000000000000000000000000000000000',
exchangeAddress: '0x4f833a24e1f95d70f028921e27040ca56e09ab0b', exchangeAddress: '0x4f833a24e1f95d70f028921e27040ca56e09ab0b',
feeRecipientAddress: '0xa258b39954cef5cb142fd567a46cddb31a670124', feeRecipientAddress: '0xa258b39954cef5cb142fd567a46cddb31a670124',
expirationTimeSeconds: '1559422407', expirationTimeSeconds: '1559422407',
salt: '1559422141994', salt: '1559422141994',
chainId: 1,
signature: signature:
'0x1cf16c2f3a210965b5e17f51b57b869ba4ddda33df92b0017b4d8da9dacd3152b122a73844eaf50ccde29a42950239ba36a525ed7f1698a8a5e1896cf7d651aed203', '0x1cf16c2f3a210965b5e17f51b57b869ba4ddda33df92b0017b4d8da9dacd3152b122a73844eaf50ccde29a42950239ba36a525ed7f1698a8a5e1896cf7d651aed203',
}; };
@ -23,7 +26,7 @@ describe('Utils', () => {
const orderHash = utils.getOrderHash(order as any); const orderHash = utils.getOrderHash(order as any);
const calculatedOrderHash = utils.getOrderHash({ order: order as any, metaData: {} }); const calculatedOrderHash = utils.getOrderHash({ order: order as any, metaData: {} });
expect(orderHash).toBe(calculatedOrderHash); expect(orderHash).toBe(calculatedOrderHash);
expect(orderHash).toBe('0x96e6eb6174dbf0458686bdae44c9a330d9a9eb563962512a7be545c4ecc13fd4'); expect(orderHash).toBe('0x5a0f346c671a39b832a487d2d7eb63ca19301554cf1f8a98a19d478a3a8be32c');
}); });
}); });
describe('.attemptAsync', () => { describe('.attemptAsync', () => {