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

update tests to use signatures instead of order hashes

Browse Source
This commit is contained in:
Steve Klebanoff 2020-09-04 10:52:49 -05:00
parent d34d46b7fd
commit e7541ac2af
No known key found for this signature in database
GPG Key ID: 8A2D7E51E87DB8B9
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/asset-swapper/test/quote_report_generator_test.ts
View File

@ -1,5 +1,4 @@
// tslint:disable:custom-no-magic-numbers // tslint:disable:custom-no-magic-numbers
import { orderHashUtils } from '@0x/order-utils';
import { SignedOrder } from '@0x/types'; import { SignedOrder } from '@0x/types';
import { BigNumber, hexUtils } from '@0x/utils'; import { BigNumber, hexUtils } from '@0x/utils';
import * as chai from 'chai'; import * as chai from 'chai';
@ -113,19 +112,19 @@ describe('generateQuoteReport', async () => {
// quote generator mock // quote generator mock
const quoteRequestor = TypeMoq.Mock.ofType<QuoteRequestor>(); const quoteRequestor = TypeMoq.Mock.ofType<QuoteRequestor>();
quoteRequestor quoteRequestor
.setup(qr => qr.getMakerUriForOrderHash(orderHashUtils.getOrderHash(orderbookOrder2))) .setup(qr => qr.getMakerUriForOrderSignature(orderbookOrder2.signature))
.returns(() => { .returns(() => {
return undefined; return undefined;
}) })
.verifiable(TypeMoq.Times.atLeastOnce()); .verifiable(TypeMoq.Times.atLeastOnce());
quoteRequestor quoteRequestor
.setup(qr => qr.getMakerUriForOrderHash(orderHashUtils.getOrderHash(rfqtOrder1))) .setup(qr => qr.getMakerUriForOrderSignature(rfqtOrder1.signature))
.returns(() => { .returns(() => {
return 'https://rfqt1.provider.club'; return 'https://rfqt1.provider.club';
}) })
.verifiable(TypeMoq.Times.atLeastOnce()); .verifiable(TypeMoq.Times.atLeastOnce());
quoteRequestor quoteRequestor
.setup(qr => qr.getMakerUriForOrderHash(orderHashUtils.getOrderHash(rfqtOrder2))) .setup(qr => qr.getMakerUriForOrderSignature(rfqtOrder2.signature))
.returns(() => { .returns(() => {
return 'https://rfqt2.provider.club'; return 'https://rfqt2.provider.club';
}) })
@ -145,7 +144,6 @@ describe('generateQuoteReport', async () => {
liquiditySource: ERC20BridgeSource.Native, liquiditySource: ERC20BridgeSource.Native,
makerAmount: rfqtOrder1.makerAssetAmount, makerAmount: rfqtOrder1.makerAssetAmount,
takerAmount: rfqtOrder1.takerAssetAmount, takerAmount: rfqtOrder1.takerAssetAmount,
orderHash: orderHashUtils.getOrderHash(rfqtOrder1),
nativeOrder: rfqtOrder1, nativeOrder: rfqtOrder1,
fillableTakerAmount: rfqtOrder1FillableAmount, fillableTakerAmount: rfqtOrder1FillableAmount,
isRfqt: true, isRfqt: true,
@ -155,7 +153,6 @@ describe('generateQuoteReport', async () => {
liquiditySource: ERC20BridgeSource.Native, liquiditySource: ERC20BridgeSource.Native,
makerAmount: rfqtOrder2.makerAssetAmount, makerAmount: rfqtOrder2.makerAssetAmount,
takerAmount: rfqtOrder2.takerAssetAmount, takerAmount: rfqtOrder2.takerAssetAmount,
orderHash: orderHashUtils.getOrderHash(rfqtOrder2),
nativeOrder: rfqtOrder2, nativeOrder: rfqtOrder2,
fillableTakerAmount: rfqtOrder2FillableAmount, fillableTakerAmount: rfqtOrder2FillableAmount,
isRfqt: true, isRfqt: true,
@ -165,7 +162,6 @@ describe('generateQuoteReport', async () => {
liquiditySource: ERC20BridgeSource.Native, liquiditySource: ERC20BridgeSource.Native,
makerAmount: orderbookOrder1.makerAssetAmount, makerAmount: orderbookOrder1.makerAssetAmount,
takerAmount: orderbookOrder1.takerAssetAmount, takerAmount: orderbookOrder1.takerAssetAmount,
orderHash: orderHashUtils.getOrderHash(orderbookOrder1),
nativeOrder: orderbookOrder1, nativeOrder: orderbookOrder1,
fillableTakerAmount: orderbookOrder1FillableAmount, fillableTakerAmount: orderbookOrder1FillableAmount,
isRfqt: false, isRfqt: false,
@ -174,7 +170,6 @@ describe('generateQuoteReport', async () => {
liquiditySource: ERC20BridgeSource.Native, liquiditySource: ERC20BridgeSource.Native,
makerAmount: orderbookOrder2.makerAssetAmount, makerAmount: orderbookOrder2.makerAssetAmount,
takerAmount: orderbookOrder2.takerAssetAmount, takerAmount: orderbookOrder2.takerAssetAmount,
orderHash: orderHashUtils.getOrderHash(orderbookOrder2),
nativeOrder: orderbookOrder2, nativeOrder: orderbookOrder2,
fillableTakerAmount: orderbookOrder2FillableAmount, fillableTakerAmount: orderbookOrder2FillableAmount,
isRfqt: false, isRfqt: false,
@ -291,7 +286,6 @@ describe('generateQuoteReport', async () => {
liquiditySource: ERC20BridgeSource.Native, liquiditySource: ERC20BridgeSource.Native,
makerAmount: orderbookOrder1.makerAssetAmount, makerAmount: orderbookOrder1.makerAssetAmount,
takerAmount: orderbookOrder1.takerAssetAmount, takerAmount: orderbookOrder1.takerAssetAmount,
orderHash: orderHashUtils.getOrderHash(orderbookOrder1),
nativeOrder: orderbookOrder1, nativeOrder: orderbookOrder1,
fillableTakerAmount: orderbookOrder1FillableAmount, fillableTakerAmount: orderbookOrder1FillableAmount,
isRfqt: false, isRfqt: false,
@ -300,7 +294,6 @@ describe('generateQuoteReport', async () => {
liquiditySource: ERC20BridgeSource.Native, liquiditySource: ERC20BridgeSource.Native,
makerAmount: orderbookOrder2.makerAssetAmount, makerAmount: orderbookOrder2.makerAssetAmount,
takerAmount: orderbookOrder2.takerAssetAmount, takerAmount: orderbookOrder2.takerAssetAmount,
orderHash: orderHashUtils.getOrderHash(orderbookOrder2),
nativeOrder: orderbookOrder2, nativeOrder: orderbookOrder2,
fillableTakerAmount: orderbookOrder2FillableAmount, fillableTakerAmount: orderbookOrder2FillableAmount,
isRfqt: false, isRfqt: false,
@ -393,7 +386,6 @@ describe('generateQuoteReport', async () => {
liquiditySource: ERC20BridgeSource.Native, liquiditySource: ERC20BridgeSource.Native,
makerAmount: orderbookOrder1.makerAssetAmount, makerAmount: orderbookOrder1.makerAssetAmount,
takerAmount: orderbookOrder1.takerAssetAmount, takerAmount: orderbookOrder1.takerAssetAmount,
orderHash: orderHashUtils.getOrderHash(orderbookOrder1),
nativeOrder: orderbookOrder1, nativeOrder: orderbookOrder1,
fillableTakerAmount: orderbookOrder1FillableAmount, fillableTakerAmount: orderbookOrder1FillableAmount,
isRfqt: false, isRfqt: false,