diff --git a/packages/asset-swapper/src/types.ts b/packages/asset-swapper/src/types.ts index 18ad80bd17..bcdfd9c3e2 100644 --- a/packages/asset-swapper/src/types.ts +++ b/packages/asset-swapper/src/types.ts @@ -1,4 +1,5 @@ import { BlockParam, ContractAddresses, GethCallOverrides } from '@0x/contract-wrappers'; +import { TakerRequestQueryParams } from '@0x/quote-server'; import { SignedOrder } from '@0x/types'; import { BigNumber } from '@0x/utils'; @@ -357,9 +358,7 @@ export enum OrderPrunerPermittedFeeTypes { export interface MockedRfqtFirmQuoteResponse { endpoint: string; requestApiKey: string; - requestParams: { - [key: string]: string | undefined; - }; + requestParams: TakerRequestQueryParams, responseData: any; responseCode: number; } @@ -370,9 +369,7 @@ export interface MockedRfqtFirmQuoteResponse { export interface MockedRfqtIndicativeQuoteResponse { endpoint: string; requestApiKey: string; - requestParams: { - [key: string]: string | undefined; - }; + requestParams: TakerRequestQueryParams, responseData: any; responseCode: number; } diff --git a/packages/asset-swapper/test/quote_requestor_test.ts b/packages/asset-swapper/test/quote_requestor_test.ts index f9fbf02fdb..ad1062799a 100644 --- a/packages/asset-swapper/test/quote_requestor_test.ts +++ b/packages/asset-swapper/test/quote_requestor_test.ts @@ -1,5 +1,6 @@ import { tokenUtils } from '@0x/dev-utils'; import { assetDataUtils } from '@0x/order-utils'; +import { TakerRequestQueryParams } from '@0x/quote-server'; import { StatusCodes } from '@0x/types'; import { BigNumber } from '@0x/utils'; import * as chai from 'chai'; @@ -35,11 +36,11 @@ describe('QuoteRequestor', async () => { // Set up RFQT responses // tslint:disable-next-line:array-type const mockedRequests: MockedRfqtFirmQuoteResponse[] = []; - const expectedParams = { + const expectedParams: TakerRequestQueryParams = { sellTokenAddress: takerToken, buyTokenAddress: makerToken, sellAmountBaseUnits: '10000', - buyAmountBaseUnits: undefined, + comparisonPrice: undefined, takerAddress, }; // Successful response @@ -209,11 +210,11 @@ describe('QuoteRequestor', async () => { // Set up RFQT responses // tslint:disable-next-line:array-type const mockedRequests: MockedRfqtIndicativeQuoteResponse[] = []; - const expectedParams = { + const expectedParams: TakerRequestQueryParams = { sellTokenAddress: takerToken, buyTokenAddress: makerToken, sellAmountBaseUnits: '10000', - buyAmountBaseUnits: undefined, + comparisonPrice: undefined, takerAddress, }; // Successful response @@ -308,11 +309,11 @@ describe('QuoteRequestor', async () => { // Set up RFQT responses // tslint:disable-next-line:array-type const mockedRequests: MockedRfqtIndicativeQuoteResponse[] = []; - const expectedParams = { + const expectedParams: TakerRequestQueryParams = { sellTokenAddress: takerToken, buyTokenAddress: makerToken, buyAmountBaseUnits: '10000', - sellAmountBaseUnits: undefined, + comparisonPrice: undefined, takerAddress, }; // Successful response