Rename baseCurrencyOrIdOrSymbol -> baseCurrency

atomex-protocol · Aug 29, 2022 · 994d6f7 · 994d6f7
1 parent eaf2a7e
commit 994d6f7
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 24 deletions.
diff --git a/src/atomex/atomex.ts b/src/atomex/atomex.ts
@@ -161,7 +161,7 @@ export class Atomex implements AtomexService {
   }
 
   async convertCurrency(fromAmount: BigNumber.Value, fromCurrency: Currency['id'], toCurrency: Currency['id']): Promise<BigNumber | undefined> {
-    const price = await this.priceManager.getAveragePrice({ baseCurrencyOrIdOrSymbol: fromCurrency, quoteCurrencyOrIdOrSymbol: toCurrency });
+    const price = await this.priceManager.getAveragePrice({ baseCurrency: fromCurrency, quoteCurrency: toCurrency });
     if (!price)
       return undefined;
 

diff --git a/src/blockchain/atomexProtocolV1/helper.ts b/src/blockchain/atomexProtocolV1/helper.ts
@@ -8,7 +8,7 @@ export const getRedeemRewardInNativeCurrency = async (
   redeemFee: FeesInfo,
   priceManager: PriceManager
 ): Promise<FeesInfo> => {
-  const nativeTokenPriceInUsd = await priceManager.getAveragePrice({ baseCurrencyOrIdOrSymbol: currencyOrId, quoteCurrencyOrIdOrSymbol: 'USD' });
+  const nativeTokenPriceInUsd = await priceManager.getAveragePrice({ baseCurrency: currencyOrId, quoteCurrency: 'USD' });
   if (!nativeTokenPriceInUsd)
     throw new Error(`Price for ${currencyOrId} in USD not found`);
 
@@ -40,7 +40,7 @@ export const getRedeemRewardInToken = async (
   if (!nativeCurrency)
     throw new Error(`Native currency not found fir ${currency.blockchain}`);
 
-  const nativeTokenPriceInCurrency = await priceManager.getAveragePrice({ baseCurrencyOrIdOrSymbol: nativeCurrency, quoteCurrencyOrIdOrSymbol: currencyOrId });
+  const nativeTokenPriceInCurrency = await priceManager.getAveragePrice({ baseCurrency: nativeCurrency, quoteCurrency: currencyOrId });
 
   if (!nativeTokenPriceInCurrency)
     throw new Error(`Price for ${nativeCurrency.id} in ${currencyOrId} not found`);

diff --git a/src/exchange/priceManager/mixedPriceManager/mixedPriceManager.ts b/src/exchange/priceManager/mixedPriceManager/mixedPriceManager.ts
@@ -20,9 +20,9 @@ export class MixedPriceManager implements PriceManager {
     private readonly providersMap: Map<string, PriceProvider>
   ) { }
 
-  async getAveragePrice({ baseCurrencyOrIdOrSymbol, quoteCurrencyOrIdOrSymbol, dataSource = DataSource.All }: GetAveragePriceParameters): Promise<BigNumber | undefined> {
-    const baseCurrencyOrSymbol = this.tryFindCurrency(baseCurrencyOrIdOrSymbol);
-    const quoteCurrencyOrSymbol = this.tryFindCurrency(quoteCurrencyOrIdOrSymbol);
+  async getAveragePrice({ baseCurrency, quoteCurrency, dataSource = DataSource.All }: GetAveragePriceParameters): Promise<BigNumber | undefined> {
+    const baseCurrencyOrSymbol = this.tryFindCurrency(baseCurrency);
+    const quoteCurrencyOrSymbol = this.tryFindCurrency(quoteCurrency);
 
     const key = this.getCacheKey({ isAverage: true, baseCurrencyOrSymbol, quoteCurrencyOrSymbol });
     if ((dataSource & DataSource.Local) === DataSource.Local) {
@@ -34,8 +34,8 @@ export class MixedPriceManager implements PriceManager {
     if ((dataSource & DataSource.Remote) === DataSource.Remote) {
       const providers = this.getAvailableProviders();
       const pricePromises = providers.map(provider => this.getPrice({
-        baseCurrencyOrIdOrSymbol: baseCurrencyOrSymbol,
-        quoteCurrencyOrIdOrSymbol: quoteCurrencyOrSymbol,
+        baseCurrency: baseCurrencyOrSymbol,
+        quoteCurrency: quoteCurrencyOrSymbol,
         provider,
         dataSource
       }));
@@ -56,9 +56,9 @@ export class MixedPriceManager implements PriceManager {
     return undefined;
   }
 
-  async getPrice({ baseCurrencyOrIdOrSymbol, quoteCurrencyOrIdOrSymbol, provider, dataSource = DataSource.All }: GetPriceParameters): Promise<BigNumber | undefined> {
-    const baseCurrencyOrSymbol = this.tryFindCurrency(baseCurrencyOrIdOrSymbol);
-    const quoteCurrencyOrSymbol = this.tryFindCurrency(quoteCurrencyOrIdOrSymbol);
+  async getPrice({ baseCurrency, quoteCurrency, provider, dataSource = DataSource.All }: GetPriceParameters): Promise<BigNumber | undefined> {
+    const baseCurrencyOrSymbol = this.tryFindCurrency(baseCurrency);
+    const quoteCurrencyOrSymbol = this.tryFindCurrency(quoteCurrency);
 
     const key = this.getCacheKey({ isAverage: false, baseCurrencyOrSymbol, quoteCurrencyOrSymbol, provider });
     if ((dataSource & DataSource.Local) === DataSource.Local) {
@@ -92,11 +92,11 @@ export class MixedPriceManager implements PriceManager {
     this.cache.clear();
   }
 
-  private tryFindCurrency(baseCurrencyOrIdOrSymbol: Currency | Currency['id']): Currency | string {
-    if (typeof baseCurrencyOrIdOrSymbol !== 'string')
-      return baseCurrencyOrIdOrSymbol;
+  private tryFindCurrency(baseCurrency: Currency | Currency['id'] | string): Currency | string {
+    if (typeof baseCurrency !== 'string')
+      return baseCurrency;
 
-    return this.currenciesProvider.getCurrency(baseCurrencyOrIdOrSymbol) || baseCurrencyOrIdOrSymbol;
+    return this.currenciesProvider.getCurrency(baseCurrency) || baseCurrency;
   }
 
   private getCacheKey({ isAverage, baseCurrencyOrSymbol, quoteCurrencyOrSymbol, provider }: GetCacheKeyParameters) {

diff --git a/src/exchange/priceManager/priceManager.ts b/src/exchange/priceManager/priceManager.ts
@@ -3,15 +3,15 @@ import type BigNumber from 'bignumber.js';
 import type { Currency, DataSource, Disposable } from '../../common/index';
 
 export interface GetPriceParameters {
-  baseCurrencyOrIdOrSymbol: Currency | Currency['id'];
-  quoteCurrencyOrIdOrSymbol: Currency | Currency['id'];
+  baseCurrency: Currency | Currency['id'] | string;
+  quoteCurrency: Currency | Currency['id'] | string;
   provider?: string;
   dataSource?: DataSource;
 }
 
 export interface GetAveragePriceParameters {
-  baseCurrencyOrIdOrSymbol: Currency | Currency['id'];
-  quoteCurrencyOrIdOrSymbol: Currency | Currency['id'];
+  baseCurrency: Currency | Currency['id'] | string;
+  quoteCurrency: Currency | Currency['id'] | string;
   dataSource?: DataSource;
 }
 

diff --git a/tests/atomex/atomexProtocolV1/atomexProtocolV1.test.ts b/tests/atomex/atomexProtocolV1/atomexProtocolV1.test.ts
@@ -11,20 +11,20 @@ describe('Atomex Protocol V1 utils', () => {
   const createPriceManager = (prices: Record<string, BigNumber>) => {
     const priceManager = new MockPriceManager();
 
-    const getPriceImplementation = (baseCurrencyOrIdOrSymbol: Currency | Currency['id'], quoteCurrencyOrIdOrSymbol: Currency | Currency['id']) => {
+    const getPriceImplementation = (baseCurrencyOrIdOrSymbol: Currency | Currency['id'] | string, quoteCurrencyOrIdOrSymbol: Currency | Currency['id'] | string) => {
       const baseCurrency = typeof baseCurrencyOrIdOrSymbol === 'string' ? baseCurrencyOrIdOrSymbol : baseCurrencyOrIdOrSymbol.symbol;
       const quoteCurrency = typeof quoteCurrencyOrIdOrSymbol === 'string' ? quoteCurrencyOrIdOrSymbol : quoteCurrencyOrIdOrSymbol.symbol;
       const symbol = `${baseCurrency}/${quoteCurrency}`;
 
       return prices[symbol];
     };
 
-    priceManager.getPrice.mockImplementation(async ({ baseCurrencyOrIdOrSymbol, quoteCurrencyOrIdOrSymbol }) => {
-      return getPriceImplementation(baseCurrencyOrIdOrSymbol, quoteCurrencyOrIdOrSymbol);
+    priceManager.getPrice.mockImplementation(async ({ baseCurrency, quoteCurrency }) => {
+      return getPriceImplementation(baseCurrency, quoteCurrency);
     });
 
-    priceManager.getAveragePrice.mockImplementation(async ({ baseCurrencyOrIdOrSymbol, quoteCurrencyOrIdOrSymbol }) => {
-      return getPriceImplementation(baseCurrencyOrIdOrSymbol, quoteCurrencyOrIdOrSymbol);
+    priceManager.getAveragePrice.mockImplementation(async ({ baseCurrency, quoteCurrency }) => {
+      return getPriceImplementation(baseCurrency, quoteCurrency);
     });
 
     return priceManager;