Refactor

atomex-protocol · Aug 29, 2022 · 1bf7e45 · 1bf7e45
1 parent ae2d44c
commit 1bf7e45
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/src/blockchain/atomexProtocolV1/index.ts b/src/blockchain/atomexProtocolV1/index.ts
@@ -1,5 +1,5 @@
 export { isAtomexProtocolV1 } from './guards';
-export { getRedeemRewardInNativeToken } from './utlis';
+export { getRedeemRewardInNativeToken, getRedeemRewardInToken } from './utlis';
 
 export type { AtomexProtocolV1 } from './atomexProtocolV1';
 export type { AtomexProtocolV1Options } from './options';

diff --git a/src/blockchain/atomexProtocolV1/utlis.ts b/src/blockchain/atomexProtocolV1/utlis.ts
@@ -16,3 +16,12 @@ export const getRedeemRewardInNativeToken = (nativeTokenPriceInUsd: BigNumber, r
 
   return result;
 };
+
+export const getRedeemRewardInToken = (nativeTokenPriceInUsd: BigNumber, nativeTokenPriceInCurrency: BigNumber, redeemFee: BigNumber): FeesInfo => {
+  const inNativeToken = getRedeemRewardInNativeToken(nativeTokenPriceInUsd, redeemFee);
+
+  return {
+    estimated: inNativeToken.estimated.multipliedBy(nativeTokenPriceInCurrency),
+    max: inNativeToken.max.multipliedBy(nativeTokenPriceInCurrency)
+  };
+};
diff --git a/src/ethereum/atomexProtocol/erc20EthereumWeb3AtomexProtocolV1.ts b/src/ethereum/atomexProtocol/erc20EthereumWeb3AtomexProtocolV1.ts
@@ -1,6 +1,6 @@
 import type BigNumber from 'bignumber.js';
 
-import { getRedeemRewardInNativeToken } from '../../blockchain/atomexProtocolV1';
+import { getRedeemRewardInToken } from '../../blockchain/atomexProtocolV1';
 import type {
   AtomexBlockchainProvider,
   AtomexProtocolV1InitiateParameters, AtomexProtocolV1RedeemParameters, AtomexProtocolV1RefundParameters,
@@ -38,12 +38,7 @@ export class ERC20EthereumWeb3AtomexProtocolV1 extends Web3AtomexProtocolV1 {
   }
 
   async getRedeemReward(nativeTokenPriceInUsd: BigNumber, nativeTokenPriceInCurrency: BigNumber, redeemFee: BigNumber): Promise<FeesInfo> {
-    const inNativeToken = getRedeemRewardInNativeToken(nativeTokenPriceInUsd, redeemFee);
-
-    return {
-      estimated: inNativeToken.estimated.multipliedBy(nativeTokenPriceInCurrency),
-      max: inNativeToken.max.multipliedBy(nativeTokenPriceInCurrency)
-    };
+    return getRedeemRewardInToken(nativeTokenPriceInUsd, nativeTokenPriceInCurrency, redeemFee);
   }
 
   getRedeemFees(params: Partial<AtomexProtocolV1InitiateParameters>): Promise<FeesInfo> {

diff --git a/src/tezos/atomexProtocol/fa12TezosTaquitoAtomexProtocolV1.ts b/src/tezos/atomexProtocol/fa12TezosTaquitoAtomexProtocolV1.ts
@@ -1,6 +1,6 @@
 import type BigNumber from 'bignumber.js';
 
-import { getRedeemRewardInNativeToken } from '../../blockchain/atomexProtocolV1';
+import { getRedeemRewardInToken } from '../../blockchain/atomexProtocolV1';
 import type {
   AtomexBlockchainProvider,
   AtomexProtocolV1InitiateParameters, AtomexProtocolV1RedeemParameters, AtomexProtocolV1RefundParameters,
@@ -38,12 +38,7 @@ export class FA12TezosTaquitoAtomexProtocolV1 extends TaquitoAtomexProtocolV1 {
   }
 
   async getRedeemReward(nativeTokenPriceInUsd: BigNumber, nativeTokenPriceInCurrency: BigNumber, redeemFee: BigNumber): Promise<FeesInfo> {
-    const inNativeToken = getRedeemRewardInNativeToken(nativeTokenPriceInUsd, redeemFee);
-
-    return {
-      estimated: inNativeToken.estimated.multipliedBy(nativeTokenPriceInCurrency),
-      max: inNativeToken.max.multipliedBy(nativeTokenPriceInCurrency)
-    };
+    return getRedeemRewardInToken(nativeTokenPriceInUsd, nativeTokenPriceInCurrency, redeemFee);
   }
 
   getRedeemFees(params: Partial<AtomexProtocolV1InitiateParameters>): Promise<FeesInfo> {

diff --git a/src/tezos/atomexProtocol/fa2TezosTaquitoAtomexProtocolV1.ts b/src/tezos/atomexProtocol/fa2TezosTaquitoAtomexProtocolV1.ts
@@ -1,6 +1,6 @@
 import type BigNumber from 'bignumber.js';
 
-import { getRedeemRewardInNativeToken } from '../../blockchain/atomexProtocolV1';
+import { getRedeemRewardInToken } from '../../blockchain/atomexProtocolV1';
 import type {
   AtomexBlockchainProvider,
   AtomexProtocolV1InitiateParameters, AtomexProtocolV1RedeemParameters, AtomexProtocolV1RefundParameters,
@@ -38,12 +38,7 @@ export class FA2TezosTaquitoAtomexProtocolV1 extends TaquitoAtomexProtocolV1 {
   }
 
   async getRedeemReward(nativeTokenPriceInUsd: BigNumber, nativeTokenPriceInCurrency: BigNumber, redeemFee: BigNumber): Promise<FeesInfo> {
-    const inNativeToken = getRedeemRewardInNativeToken(nativeTokenPriceInUsd, redeemFee);
-
-    return {
-      estimated: inNativeToken.estimated.multipliedBy(nativeTokenPriceInCurrency),
-      max: inNativeToken.max.multipliedBy(nativeTokenPriceInCurrency)
-    };
+    return getRedeemRewardInToken(nativeTokenPriceInUsd, nativeTokenPriceInCurrency, redeemFee);
   }
 
   getRedeemFees(params: Partial<AtomexProtocolV1InitiateParameters>): Promise<FeesInfo> {