From 088b331f1920e9d394e65b466a29f01c568a86ad Mon Sep 17 00:00:00 2001 From: Alex Kroeger Date: Fri, 16 Oct 2020 10:28:48 -0700 Subject: [PATCH] Prettier, cleared up naming --- .../src/utils/market_operation_utils/index.ts | 8 ++--- .../sampler_operations.ts | 32 ++++++++++++++++--- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/packages/asset-swapper/src/utils/market_operation_utils/index.ts b/packages/asset-swapper/src/utils/market_operation_utils/index.ts index 8f406f055f..c054959378 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/index.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/index.ts @@ -161,7 +161,7 @@ export class MarketOperationUtils { quoteSourceFilters.isAllowed(ERC20BridgeSource.Cream), ); - const excludedSources = [ + const offChainSources = [ ...(!sampleCreamOnChain ? [ERC20BridgeSource.Cream] : []), ...(!sampleBalancerOnChain ? [ERC20BridgeSource.Balancer] : []), ]; @@ -192,7 +192,7 @@ export class MarketOperationUtils { ), // Get sell quotes for taker -> maker. this._sampler.getSellQuotes( - quoteSourceFilters.exclude(excludedSources).sources, + quoteSourceFilters.exclude(offChainSources).sources, makerToken, takerToken, sampleAmounts, @@ -304,7 +304,7 @@ export class MarketOperationUtils { quoteSourceFilters.isAllowed(ERC20BridgeSource.Cream), ); - const excludedSources = [ + const offChainSources = [ ...(!sampleCreamOnChain ? [ERC20BridgeSource.Cream] : []), ...(!sampleBalancerOnChain ? [ERC20BridgeSource.Balancer] : []), ]; @@ -335,7 +335,7 @@ export class MarketOperationUtils { ), // Get buy quotes for taker -> maker. this._sampler.getBuyQuotes( - quoteSourceFilters.exclude(excludedSources).sources, + quoteSourceFilters.exclude(offChainSources).sources, makerToken, takerToken, sampleAmounts, diff --git a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts index d700eed974..5d5b0385a8 100644 --- a/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts +++ b/packages/asset-swapper/src/utils/market_operation_utils/sampler_operations.ts @@ -1075,13 +1075,25 @@ export class SamplerOperations { return this.balancerPoolsCache .getCachedPoolAddressesForPair(takerToken, makerToken)! .map(poolAddress => - this.getBalancerSellQuotes(poolAddress, makerToken, takerToken, takerFillAmounts, ERC20BridgeSource.Balancer), + this.getBalancerSellQuotes( + poolAddress, + makerToken, + takerToken, + takerFillAmounts, + ERC20BridgeSource.Balancer, + ), ); case ERC20BridgeSource.Cream: return this.creamPoolsCache .getCachedPoolAddressesForPair(takerToken, makerToken)! .map(poolAddress => - this.getBalancerSellQuotes(poolAddress, makerToken, takerToken, takerFillAmounts, ERC20BridgeSource.Cream), + this.getBalancerSellQuotes( + poolAddress, + makerToken, + takerToken, + takerFillAmounts, + ERC20BridgeSource.Cream, + ), ); case ERC20BridgeSource.Shell: return this.getShellSellQuotes(makerToken, takerToken, takerFillAmounts); @@ -1172,13 +1184,25 @@ export class SamplerOperations { return this.balancerPoolsCache .getCachedPoolAddressesForPair(takerToken, makerToken)! .map(poolAddress => - this.getBalancerBuyQuotes(poolAddress, makerToken, takerToken, makerFillAmounts, ERC20BridgeSource.Balancer), + this.getBalancerBuyQuotes( + poolAddress, + makerToken, + takerToken, + makerFillAmounts, + ERC20BridgeSource.Balancer, + ), ); case ERC20BridgeSource.Cream: return this.creamPoolsCache .getCachedPoolAddressesForPair(takerToken, makerToken)! .map(poolAddress => - this.getBalancerBuyQuotes(poolAddress, makerToken, takerToken, makerFillAmounts, ERC20BridgeSource.Cream), + this.getBalancerBuyQuotes( + poolAddress, + makerToken, + takerToken, + makerFillAmounts, + ERC20BridgeSource.Cream, + ), ); case ERC20BridgeSource.Shell: return this.getShellBuyQuotes(makerToken, takerToken, makerFillAmounts);