Prettier, cleared up naming

This commit is contained in:
Alex Kroeger 2020-10-16 10:28:48 -07:00
parent 56f2dec441
commit 088b331f19
2 changed files with 32 additions and 8 deletions

View File

@ -161,7 +161,7 @@ export class MarketOperationUtils {
quoteSourceFilters.isAllowed(ERC20BridgeSource.Cream), quoteSourceFilters.isAllowed(ERC20BridgeSource.Cream),
); );
const excludedSources = [ const offChainSources = [
...(!sampleCreamOnChain ? [ERC20BridgeSource.Cream] : []), ...(!sampleCreamOnChain ? [ERC20BridgeSource.Cream] : []),
...(!sampleBalancerOnChain ? [ERC20BridgeSource.Balancer] : []), ...(!sampleBalancerOnChain ? [ERC20BridgeSource.Balancer] : []),
]; ];
@ -192,7 +192,7 @@ export class MarketOperationUtils {
), ),
// Get sell quotes for taker -> maker. // Get sell quotes for taker -> maker.
this._sampler.getSellQuotes( this._sampler.getSellQuotes(
quoteSourceFilters.exclude(excludedSources).sources, quoteSourceFilters.exclude(offChainSources).sources,
makerToken, makerToken,
takerToken, takerToken,
sampleAmounts, sampleAmounts,
@ -304,7 +304,7 @@ export class MarketOperationUtils {
quoteSourceFilters.isAllowed(ERC20BridgeSource.Cream), quoteSourceFilters.isAllowed(ERC20BridgeSource.Cream),
); );
const excludedSources = [ const offChainSources = [
...(!sampleCreamOnChain ? [ERC20BridgeSource.Cream] : []), ...(!sampleCreamOnChain ? [ERC20BridgeSource.Cream] : []),
...(!sampleBalancerOnChain ? [ERC20BridgeSource.Balancer] : []), ...(!sampleBalancerOnChain ? [ERC20BridgeSource.Balancer] : []),
]; ];
@ -335,7 +335,7 @@ export class MarketOperationUtils {
), ),
// Get buy quotes for taker -> maker. // Get buy quotes for taker -> maker.
this._sampler.getBuyQuotes( this._sampler.getBuyQuotes(
quoteSourceFilters.exclude(excludedSources).sources, quoteSourceFilters.exclude(offChainSources).sources,
makerToken, makerToken,
takerToken, takerToken,
sampleAmounts, sampleAmounts,

View File

@ -1075,13 +1075,25 @@ export class SamplerOperations {
return this.balancerPoolsCache return this.balancerPoolsCache
.getCachedPoolAddressesForPair(takerToken, makerToken)! .getCachedPoolAddressesForPair(takerToken, makerToken)!
.map(poolAddress => .map(poolAddress =>
this.getBalancerSellQuotes(poolAddress, makerToken, takerToken, takerFillAmounts, ERC20BridgeSource.Balancer), this.getBalancerSellQuotes(
poolAddress,
makerToken,
takerToken,
takerFillAmounts,
ERC20BridgeSource.Balancer,
),
); );
case ERC20BridgeSource.Cream: case ERC20BridgeSource.Cream:
return this.creamPoolsCache return this.creamPoolsCache
.getCachedPoolAddressesForPair(takerToken, makerToken)! .getCachedPoolAddressesForPair(takerToken, makerToken)!
.map(poolAddress => .map(poolAddress =>
this.getBalancerSellQuotes(poolAddress, makerToken, takerToken, takerFillAmounts, ERC20BridgeSource.Cream), this.getBalancerSellQuotes(
poolAddress,
makerToken,
takerToken,
takerFillAmounts,
ERC20BridgeSource.Cream,
),
); );
case ERC20BridgeSource.Shell: case ERC20BridgeSource.Shell:
return this.getShellSellQuotes(makerToken, takerToken, takerFillAmounts); return this.getShellSellQuotes(makerToken, takerToken, takerFillAmounts);
@ -1172,13 +1184,25 @@ export class SamplerOperations {
return this.balancerPoolsCache return this.balancerPoolsCache
.getCachedPoolAddressesForPair(takerToken, makerToken)! .getCachedPoolAddressesForPair(takerToken, makerToken)!
.map(poolAddress => .map(poolAddress =>
this.getBalancerBuyQuotes(poolAddress, makerToken, takerToken, makerFillAmounts, ERC20BridgeSource.Balancer), this.getBalancerBuyQuotes(
poolAddress,
makerToken,
takerToken,
makerFillAmounts,
ERC20BridgeSource.Balancer,
),
); );
case ERC20BridgeSource.Cream: case ERC20BridgeSource.Cream:
return this.creamPoolsCache return this.creamPoolsCache
.getCachedPoolAddressesForPair(takerToken, makerToken)! .getCachedPoolAddressesForPair(takerToken, makerToken)!
.map(poolAddress => .map(poolAddress =>
this.getBalancerBuyQuotes(poolAddress, makerToken, takerToken, makerFillAmounts, ERC20BridgeSource.Cream), this.getBalancerBuyQuotes(
poolAddress,
makerToken,
takerToken,
makerFillAmounts,
ERC20BridgeSource.Cream,
),
); );
case ERC20BridgeSource.Shell: case ERC20BridgeSource.Shell:
return this.getShellBuyQuotes(makerToken, takerToken, makerFillAmounts); return this.getShellBuyQuotes(makerToken, takerToken, makerFillAmounts);