From 93872ad7a30cd98bca8c4fe14087cb5b732b42b9 Mon Sep 17 00:00:00 2001
From: "F. Eugene Aumson" <feuGeneA@users.noreply.github.com>
Date: Thu, 9 Apr 2020 12:12:52 -0400
Subject: [PATCH] Push RFQ-T opts to own SwapQuoterOpts subnamespace

Addresses review comment https://github.com/0xProject/0x-monorepo/pull/2541#discussion_r405963240
---
 packages/asset-swapper/src/constants.ts   | 6 ++++--
 packages/asset-swapper/src/swap_quoter.ts | 4 ++--
 packages/asset-swapper/src/types.ts       | 6 ++++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/asset-swapper/src/constants.ts b/packages/asset-swapper/src/constants.ts
index 267238008a..0d227e2319 100644
--- a/packages/asset-swapper/src/constants.ts
+++ b/packages/asset-swapper/src/constants.ts
@@ -43,8 +43,10 @@ const DEFAULT_SWAP_QUOTER_OPTS: SwapQuoterOpts = {
     },
     ...DEFAULT_ORDER_PRUNER_OPTS,
     samplerGasLimit: 250e6,
-    rfqtTakerApiKeyWhitelist: [],
-    rfqtMakerEndpoints: [],
+    rfqt: {
+        takerApiKeyWhitelist: [],
+        makerEndpoints: [],
+    },
 };
 
 const DEFAULT_FORWARDER_EXTENSION_CONTRACT_OPTS: ForwarderExtensionContractOpts = {
diff --git a/packages/asset-swapper/src/swap_quoter.ts b/packages/asset-swapper/src/swap_quoter.ts
index dcf691d4d5..07261ad140 100644
--- a/packages/asset-swapper/src/swap_quoter.ts
+++ b/packages/asset-swapper/src/swap_quoter.ts
@@ -165,8 +165,8 @@ export class SwapQuoter {
         this.orderbook = orderbook;
         this.expiryBufferMs = expiryBufferMs;
         this.permittedOrderFeeTypes = permittedOrderFeeTypes;
-        this.rfqtTakerApiKeyWhitelist = options.rfqtTakerApiKeyWhitelist || [];
-        this.rfqtMakerEndpoints = options.rfqtMakerEndpoints || [];
+        this.rfqtTakerApiKeyWhitelist = options.rfqt ? options.rfqt.takerApiKeyWhitelist || [] : [];
+        this.rfqtMakerEndpoints = options.rfqt ? options.rfqt.makerEndpoints || [] : [];
         this._contractAddresses = options.contractAddresses || getContractAddressesForChainOrThrow(chainId);
         this._devUtilsContract = new DevUtilsContract(this._contractAddresses.devUtils, provider);
         this._protocolFeeUtils = new ProtocolFeeUtils(constants.PROTOCOL_FEE_UTILS_POLLING_INTERVAL_IN_MS);
diff --git a/packages/asset-swapper/src/types.ts b/packages/asset-swapper/src/types.ts
index 8fe93f2fa3..bcbfbe9e01 100644
--- a/packages/asset-swapper/src/types.ts
+++ b/packages/asset-swapper/src/types.ts
@@ -217,8 +217,10 @@ export interface SwapQuoterOpts extends OrderPrunerOpts {
     contractAddresses?: ContractAddresses;
     samplerGasLimit?: number;
     liquidityProviderRegistryAddress?: string;
-    rfqtTakerApiKeyWhitelist?: string[];
-    rfqtMakerEndpoints?: string[];
+    rfqt?: {
+        takerApiKeyWhitelist?: string[];
+        makerEndpoints?: string[];
+    };
     quoteRequestor?: QuoteRequestor;
 }