refactor: rename decimal field to coinDecimal in market pools and col…

…laterals
scallop-io · Oct 2, 2023 · 5716107 · 5716107
1 parent 38bd69c
commit 5716107
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/src/queries/coreQuery.ts b/src/queries/coreQuery.ts
@@ -92,7 +92,7 @@ export const queryMarket = async (query: ScallopQuery) => {
       coinType: coinType,
       marketCoinType: query.utils.parseMarketCoinType(coinName),
       coinWrappedType: query.utils.getCoinWrappedType(coinName),
-      decimal: query.utils.getCoinDecimal(coinName),
+      coinDecimal: query.utils.getCoinDecimal(coinName),
       coinPrice: coinPrice,
       ...calculatedMarketPoolData,
     });
@@ -122,7 +122,7 @@ export const queryMarket = async (query: ScallopQuery) => {
       coinType: coinType,
       marketCoinType: query.utils.parseMarketCoinType(coinName),
       coinWrappedType: query.utils.getCoinWrappedType(coinName),
-      decimal: query.utils.getCoinDecimal(coinName),
+      coinDecimal: query.utils.getCoinDecimal(coinName),
       coinPrice: coinPrice,
       ...parsedMarketCollateralData,
     });
@@ -323,7 +323,7 @@ export const getMarketPool = async (
       coinType: query.utils.parseCoinType(coinName),
       marketCoinType: query.utils.parseMarketCoinType(coinName),
       coinWrappedType: query.utils.getCoinWrappedType(coinName),
-      decimal: query.utils.getCoinDecimal(coinName),
+      coinDecimal: query.utils.getCoinDecimal(coinName),
       coinPrice: coinPrice ?? 0,
       ...calculatedMarketPoolData,
     };
@@ -477,7 +477,7 @@ export const getMarketCollateral = async (
       coinType: query.utils.parseCoinType(coinName),
       marketCoinType: query.utils.parseMarketCoinType(coinName),
       coinWrappedType: query.utils.getCoinWrappedType(coinName),
-      decimal: query.utils.getCoinDecimal(coinName),
+      coinDecimal: query.utils.getCoinDecimal(coinName),
       coinPrice: coinPrice ?? 0,
       ...parsedMarketCollateralData,
     };
@@ -617,7 +617,6 @@ export const getCoinAmounts = async (
     const type = coinObject.type as string;
     if (coinObject.content && 'fields' in coinObject.content) {
       const fields = coinObject.content.fields as any;
-      console.log(type);
       const coinName = query.utils.parseCoinName(type);
       if (coinName) {
         coins[coinName] = BigNumber(coins[coinName] ?? 0)

diff --git a/src/types/query/core.ts b/src/types/query/core.ts
@@ -117,7 +117,7 @@ export type MarketPool = {
   coinType: string;
   marketCoinType: string;
   coinWrappedType: CoinWrappedType;
-  decimal: number;
+  coinDecimal: number;
   coinPrice: number;
 } & CalculatedMarketPoolData;
 
@@ -127,7 +127,7 @@ export type MarketCollateral = {
   coinType: string;
   marketCoinType: string;
   coinWrappedType: CoinWrappedType;
-  decimal: number;
+  coinDecimal: number;
   coinPrice: number;
 } & ParsedMarketCollateralData;
 

diff --git a/src/utils/query.ts b/src/utils/query.ts
@@ -130,6 +130,12 @@ export const calculateMarketPoolData = (
   };
 };
 
+/**
+ *  Parse origin market collateral data to a more readable format.
+ *
+ * @param originMarketCollateralData - Origin market collateral data
+ * @return Parsed market collateral data
+ */
 export const parseOriginMarketCollateralData = (
   originMarketCollateralData: OriginMarketCollateralData
 ): ParsedMarketCollateralData => {