prettified

This commit is contained in:
Daniel Pyrathon 2020-07-23 10:16:22 -07:00
parent e6dcf92ec8
commit d7918ea047
3 changed files with 41 additions and 24 deletions

View File

@ -559,7 +559,11 @@ export class SwapQuoter {
// If RFQT is enabled and `nativeExclusivelyRFQT` is set, then `ERC20BridgeSource.Native` should
// never be excluded.
if ((opts.rfqt && opts.rfqt.nativeExclusivelyRFQT === true) && opts.excludedSources.includes(ERC20BridgeSource.Native)) {
if (
opts.rfqt &&
opts.rfqt.nativeExclusivelyRFQT === true &&
opts.excludedSources.includes(ERC20BridgeSource.Native)
) {
throw new Error('Native liquidity cannot be excluded if "rfqt.nativeExclusivelyRFQT" is set');
}
@ -567,7 +571,8 @@ export class SwapQuoter {
const orderBatchPromises: Array<Promise<SignedOrder[]>> = [];
orderBatchPromises.push(
// Don't fetch Open Orderbook orders from the DB if Native has been excluded, or if `nativeExclusivelyRFQT` has been set.
opts.excludedSources.includes(ERC20BridgeSource.Native) || (opts.rfqt && opts.rfqt.nativeExclusivelyRFQT === true)
opts.excludedSources.includes(ERC20BridgeSource.Native) ||
(opts.rfqt && opts.rfqt.nativeExclusivelyRFQT === true)
? Promise.resolve([])
: this._getSignedOrdersAsync(makerAssetData, takerAssetData),
);

View File

@ -26,6 +26,14 @@ import {
OrderDomain,
} from './types';
/**
* Returns a indicative quotes or an empty array if RFQT is not enabled or requested
* @param makerAssetData the maker asset data
* @param takerAssetData the taker asset data
* @param marketOperation Buy or Sell
* @param assetFillAmount the amount to fill, in base units
* @param opts market request options
*/
export async function getRfqtIndicativeQuotesAsync(
makerAssetData: string,
takerAssetData: string,

View File

@ -357,7 +357,8 @@ describe('MarketOperationUtils tests', () => {
);
expect(result.length).to.eql(0);
requestor.verify(
r => r.requestRfqtIndicativeQuotesAsync(
r =>
r.requestRfqtIndicativeQuotesAsync(
TypeMoq.It.isAny(),
TypeMoq.It.isAny(),
TypeMoq.It.isAny(),
@ -370,15 +371,18 @@ describe('MarketOperationUtils tests', () => {
it('calls RFQT if Native source is not excluded', async () => {
const requestor = TypeMoq.Mock.ofType(QuoteRequestor, TypeMoq.MockBehavior.Loose);
requestor.setup(
r => r.requestRfqtIndicativeQuotesAsync(
requestor
.setup(r =>
r.requestRfqtIndicativeQuotesAsync(
TypeMoq.It.isAny(),
TypeMoq.It.isAny(),
TypeMoq.It.isAny(),
TypeMoq.It.isAny(),
TypeMoq.It.isAny(),
),
).returns(() => Promise.resolve([])).verifiable(TypeMoq.Times.once());
)
.returns(() => Promise.resolve([]))
.verifiable(TypeMoq.Times.once());
await getRfqtIndicativeQuotesAsync(
MAKER_ASSET_DATA,
TAKER_ASSET_DATA,