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

added fix

Browse Source
This commit is contained in:
Daniel Pyrathon
2020-10-05 17:24:23 -07:00
parent 83c942ad8c
commit efef5f122f
5 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/asset-swapper/src/types.ts
View File

@@ -383,4 +383,4 @@ export interface SamplerOverrides {
block: BlockParam; block: BlockParam;
} }
export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>; export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;

5
packages/asset-swapper/src/utils/market_operation_utils/index.ts
View File

@@ -1,10 +1,11 @@
import { ContractAddresses } from '@0x/contract-addresses'; import { ContractAddresses } from '@0x/contract-addresses';
import { Web3Wrapper } from '@0x/dev-utils';
import { RFQTIndicativeQuote } from '@0x/quote-server'; import { RFQTIndicativeQuote } from '@0x/quote-server';
import { SignedOrder } from '@0x/types'; import { SignedOrder } from '@0x/types';
import { BigNumber, NULL_ADDRESS } from '@0x/utils'; import { BigNumber, NULL_ADDRESS } from '@0x/utils';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { MarketOperation } from '../../types'; import { MarketOperation, Omit } from '../../types';
import { QuoteRequestor } from '../quote_requestor'; import { QuoteRequestor } from '../quote_requestor';
import { generateQuoteReport, QuoteReport } from './../quote_report_generator'; import { generateQuoteReport, QuoteReport } from './../quote_report_generator';
@@ -28,7 +29,6 @@ import {
import { findOptimalPathAsync } from './path_optimizer'; import { findOptimalPathAsync } from './path_optimizer';
import { DexOrderSampler, getSampleAmounts } from './sampler'; import { DexOrderSampler, getSampleAmounts } from './sampler';
import { SourceFilters } from './source_filters'; import { SourceFilters } from './source_filters';
import { Omit } from '../../types';
import { import {
AggregationError, AggregationError,
DexSample, DexSample,
@@ -42,7 +42,6 @@ import {
OrderDomain, OrderDomain,
TokenAdjacencyGraph, TokenAdjacencyGraph,
} from './types'; } from './types';
import { Web3Wrapper } from '@0x/dev-utils';
// tslint:disable:boolean-naming // tslint:disable:boolean-naming

3
packages/asset-swapper/src/utils/market_operation_utils/multihop_utils.ts
View File

@@ -1,10 +1,11 @@
import { BigNumber } from '@0x/utils'; import { BigNumber } from '@0x/utils';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { Omit } from '../../types';
import { ZERO_AMOUNT } from './constants'; import { ZERO_AMOUNT } from './constants';
import { getTwoHopAdjustedRate } from './fills'; import { getTwoHopAdjustedRate } from './fills';
import { DexSample, FeeSchedule, MarketSideLiquidity, MultiHopFillData, TokenAdjacencyGraph } from './types'; import { DexSample, FeeSchedule, MarketSideLiquidity, MultiHopFillData, TokenAdjacencyGraph } from './types';
import { Omit } from '../../types';
/** /**
* Given a token pair, returns the intermediate tokens to consider for two-hop routes. * Given a token pair, returns the intermediate tokens to consider for two-hop routes.

10
packages/asset-swapper/test/market_operation_utils_test.ts
View File

@@ -725,7 +725,7 @@ describe('MarketOperationUtils tests', () => {
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
) ),
).callback(( ).callback((
_makerAssetData: string, _makerAssetData: string,
_takerAssetData: string, _takerAssetData: string,
@@ -763,7 +763,7 @@ describe('MarketOperationUtils tests', () => {
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
TypeMoq.It.isAny(), TypeMoq.It.isAny(),
) ),
).returns(async () => { ).returns(async () => {
return { return {
dexQuotes: [], dexQuotes: [],
@@ -788,7 +788,7 @@ describe('MarketOperationUtils tests', () => {
makerTokenDecimals: 6, makerTokenDecimals: 6,
takerTokenDecimals: 18, takerTokenDecimals: 18,
}; };
}) });
const result = await mockedMarketOpUtils.object.getMarketSellOrdersAsync(ORDERS, Web3Wrapper.toBaseUnitAmount(1, 18), { const result = await mockedMarketOpUtils.object.getMarketSellOrdersAsync(ORDERS, Web3Wrapper.toBaseUnitAmount(1, 18), {
...DEFAULT_OPTS, ...DEFAULT_OPTS,
rfqt: { rfqt: {
@@ -799,10 +799,10 @@ describe('MarketOperationUtils tests', () => {
quoteRequestor: { quoteRequestor: {
requestRfqtFirmQuotesAsync: mockedQuoteRequestor.object.requestRfqtFirmQuotesAsync, requestRfqtFirmQuotesAsync: mockedQuoteRequestor.object.requestRfqtFirmQuotesAsync,
} as any, } as any,
} },
}); });
expect(result.optimizedOrders.length).to.eql(1); expect(result.optimizedOrders.length).to.eql(1);
expect(requestedComparisonPrice!.toString()).to.eql("0.003125"); expect(requestedComparisonPrice!.toString()).to.eql('0.003125');
expect(result.optimizedOrders[0].makerAssetAmount.toString()).to.eql('321000000'); expect(result.optimizedOrders[0].makerAssetAmount.toString()).to.eql('321000000');
expect(result.optimizedOrders[0].takerAssetAmount.toString()).to.eql('1000000000000000000'); expect(result.optimizedOrders[0].takerAssetAmount.toString()).to.eql('1000000000000000000');
}); });

1
packages/asset-swapper/test/quote_requestor_test.ts
View File

@@ -1,4 +1,3 @@
import { randomAddress } from '@0x/contracts-test-utils';
import { tokenUtils } from '@0x/dev-utils'; import { tokenUtils } from '@0x/dev-utils';
import { assetDataUtils } from '@0x/order-utils'; import { assetDataUtils } from '@0x/order-utils';
import { StatusCodes } from '@0x/types'; import { StatusCodes } from '@0x/types';