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

`@0x/asset-swapper: Address review comments.

Browse Source
This commit is contained in:
Lawrence Forman 2020-02-11 12:07:44 -07:00
parent 12e65bbf26
commit a36ff9e365
2 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,11 +106,10 @@ export class MarketOperationUtils {
if (!optimalPath) { if (!optimalPath) {
throw new Error(AggregationError.NoOptimalPath); throw new Error(AggregationError.NoOptimalPath);
} }
const [outputToken, inputToken] = getOrderTokens(nativeOrders[0]);
return this._createOrderUtils.createSellOrdersFromPath( return this._createOrderUtils.createSellOrdersFromPath(
this._orderDomain, this._orderDomain,
inputToken, takerToken,
outputToken, makerToken,
collapsePath(optimalPath, false), collapsePath(optimalPath, false),
_opts.bridgeSlippage, _opts.bridgeSlippage,
); );

30
packages/asset-swapper/test/dex_sampler_test.ts
View File

@ -55,7 +55,7 @@ describe('DexSampler tests', () => {
function createOrder(overrides?: Partial<SignedOrder>): SignedOrder { function createOrder(overrides?: Partial<SignedOrder>): SignedOrder {
return { return {
chainId: CHAIN_ID, chainId: CHAIN_ID,
exchangeAddress: hexUtils.random(20), exchangeAddress: randomAddress(),
makerAddress: constants.NULL_ADDRESS, makerAddress: constants.NULL_ADDRESS,
takerAddress: constants.NULL_ADDRESS, takerAddress: constants.NULL_ADDRESS,
senderAddress: constants.NULL_ADDRESS, senderAddress: constants.NULL_ADDRESS,
@ -111,8 +111,8 @@ describe('DexSampler tests', () => {
}); });
it('getKyberSellQuotes()', async () => { it('getKyberSellQuotes()', async () => {
const expectedTakerToken = hexUtils.random(20); const expectedTakerToken = randomAddress();
const expectedMakerToken = hexUtils.random(20); const expectedMakerToken = randomAddress();
const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const sampler = new MockSamplerContract({ const sampler = new MockSamplerContract({
@ -135,8 +135,8 @@ describe('DexSampler tests', () => {
}); });
it('getEth2DaiSellQuotes()', async () => { it('getEth2DaiSellQuotes()', async () => {
const expectedTakerToken = hexUtils.random(20); const expectedTakerToken = randomAddress();
const expectedMakerToken = hexUtils.random(20); const expectedMakerToken = randomAddress();
const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const sampler = new MockSamplerContract({ const sampler = new MockSamplerContract({
@ -159,8 +159,8 @@ describe('DexSampler tests', () => {
}); });
it('getUniswapSellQuotes()', async () => { it('getUniswapSellQuotes()', async () => {
const expectedTakerToken = hexUtils.random(20); const expectedTakerToken = randomAddress();
const expectedMakerToken = hexUtils.random(20); const expectedMakerToken = randomAddress();
const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const sampler = new MockSamplerContract({ const sampler = new MockSamplerContract({
@ -183,8 +183,8 @@ describe('DexSampler tests', () => {
}); });
it('getEth2DaiBuyQuotes()', async () => { it('getEth2DaiBuyQuotes()', async () => {
const expectedTakerToken = hexUtils.random(20); const expectedTakerToken = randomAddress();
const expectedMakerToken = hexUtils.random(20); const expectedMakerToken = randomAddress();
const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const sampler = new MockSamplerContract({ const sampler = new MockSamplerContract({
@ -207,8 +207,8 @@ describe('DexSampler tests', () => {
}); });
it('getUniswapBuyQuotes()', async () => { it('getUniswapBuyQuotes()', async () => {
const expectedTakerToken = hexUtils.random(20); const expectedTakerToken = randomAddress();
const expectedMakerToken = hexUtils.random(20); const expectedMakerToken = randomAddress();
const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedTakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10); const expectedMakerFillAmounts = getSampleAmounts(new BigNumber(100e18), 10);
const sampler = new MockSamplerContract({ const sampler = new MockSamplerContract({
@ -235,8 +235,8 @@ describe('DexSampler tests', () => {
} }
it('getSellQuotes()', async () => { it('getSellQuotes()', async () => {
const expectedTakerToken = hexUtils.random(20); const expectedTakerToken = randomAddress();
const expectedMakerToken = hexUtils.random(20); const expectedMakerToken = randomAddress();
const sources = [ERC20BridgeSource.Kyber, ERC20BridgeSource.Eth2Dai, ERC20BridgeSource.Uniswap]; const sources = [ERC20BridgeSource.Kyber, ERC20BridgeSource.Eth2Dai, ERC20BridgeSource.Uniswap];
const ratesBySource: RatesBySource = { const ratesBySource: RatesBySource = {
[ERC20BridgeSource.Kyber]: getRandomFloat(0, 100), [ERC20BridgeSource.Kyber]: getRandomFloat(0, 100),
@ -285,8 +285,8 @@ describe('DexSampler tests', () => {
}); });
it('getBuyQuotes()', async () => { it('getBuyQuotes()', async () => {
const expectedTakerToken = hexUtils.random(20); const expectedTakerToken = randomAddress();
const expectedMakerToken = hexUtils.random(20); const expectedMakerToken = randomAddress();
const sources = [ERC20BridgeSource.Eth2Dai, ERC20BridgeSource.Uniswap]; const sources = [ERC20BridgeSource.Eth2Dai, ERC20BridgeSource.Uniswap];
const ratesBySource: RatesBySource = { const ratesBySource: RatesBySource = {
[ERC20BridgeSource.Eth2Dai]: getRandomFloat(0, 100), [ERC20BridgeSource.Eth2Dai]: getRandomFloat(0, 100),