Fix: change toHuman to toJson when appropriate (#54)

* switch from toHuman to toJson when possible * lint & prettier
chainflip-io · May 6, 2024 · fa0ff12 · fa0ff12
1 parent 2ab3c3e
commit fa0ff12
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 34 deletions.
diff --git a/src/metrics/chainflip/countEvents.ts b/src/metrics/chainflip/countEvents.ts
@@ -56,7 +56,7 @@ export const countEvents = async (context: Context): Promise<void> => {
 
         let error;
         if (event.method === 'ExtrinsicFailed') {
-            error = await getStateChainError(api, event.data.toHuman().dispatchError.Module);
+            error = await getStateChainError(api, event.data.toJSON()[0].module);
             const parsedError = error.data.name.split(':');
             metricExtrinsicFailed.labels(`${parsedError[0]}`, `${parsedError[1]}`).inc();
         }

diff --git a/src/metrics/chainflip/gatherGlobalValues.ts b/src/metrics/chainflip/gatherGlobalValues.ts
@@ -8,10 +8,10 @@ export const gatherGlobalValues = async (context: Context): Promise<void> => {
         global.epochIndex = Number(epoch);
 
         const epochKey = await api.query.polkadotThresholdSigner.currentKeyEpoch();
-        const dotAggKeyAddress = await api.query.polkadotThresholdSigner.keys(epochKey.toHuman());
+        const dotAggKeyAddress = await api.query.polkadotThresholdSigner.keys(epochKey.toJSON());
 
         if (dotAggKeyAddress) {
-            global.dotAggKeyAddress = dotAggKeyAddress.toHuman();
+            global.dotAggKeyAddress = dotAggKeyAddress.toJSON();
         }
     } catch (err) {
         logger.error(err);

diff --git a/src/metrics/chainflip/gaugeBtcBlockTime.ts b/src/metrics/chainflip/gaugeBtcBlockTime.ts
@@ -35,9 +35,9 @@ export const gaugeBtcBlockTime = async (context: Context): Promise<void> => {
         const timestamp: number = Number(await api.query.timestamp.now());
         const currentChainState: any = (
             await api.query.bitcoinChainTracking.currentChainState()
-        ).toHuman();
+        ).toJSON();
         if (currentChainState) {
-            const currentBtcBlock: number = currentChainState.blockHeight.replace(/,/g, '');
+            const currentBtcBlock: number = currentChainState.blockHeight;
             if (previousTimestamp === 0) {
                 previousTimestamp = Number(timestamp);
             }

diff --git a/src/metrics/chainflip/gaugeDotBlockTime.ts b/src/metrics/chainflip/gaugeDotBlockTime.ts
@@ -32,9 +32,9 @@ export const gaugeDotBlockTime = async (context: Context): Promise<void> => {
         const timestamp: number = Number(await api.query.timestamp.now());
         const currentChainState: any = (
             await api.query.polkadotChainTracking.currentChainState()
-        ).toHuman();
+        ).toJSON();
         if (currentChainState) {
-            const currentDotBlock: number = currentChainState.blockHeight.replace(/,/g, '');
+            const currentDotBlock: number = currentChainState.blockHeight;
             if (previousTimestamp === 0) {
                 previousTimestamp = Number(timestamp);
             }

diff --git a/src/metrics/chainflip/gaugeEthBlockTime.ts b/src/metrics/chainflip/gaugeEthBlockTime.ts
@@ -33,9 +33,9 @@ export const gaugeEthBlockTime = async (context: Context): Promise<void> => {
     metricFailure.labels({ metric: metricNameError }).set(0);
     try {
         const timestamp: number = Number(await api.query.timestamp.now());
-        const currentEthBlock: number = (await api.query.ethereumChainTracking.currentChainState())
-            .toHuman()
-            .blockHeight.replace(/,/g, '');
+        const currentEthBlock: number = (
+            await api.query.ethereumChainTracking.currentChainState()
+        ).toJSON();
         if (previousTimestamp === 0) {
             previousTimestamp = Number(timestamp);
         }

diff --git a/src/metrics/chainflip/gaugeFeeDeficit.ts b/src/metrics/chainflip/gaugeFeeDeficit.ts
@@ -18,28 +18,24 @@ export const gaugeFeeDeficit = async (context: Context): Promise<void> => {
     try {
         // ETH fees balance
         const feeWitheldEth = Number(
-            (await api.query.ethereumIngressEgress.withheldTransactionFees('Eth'))
-                .toHuman()
-                .replace(/,/g, ''),
+            (await api.query.ethereumIngressEgress.withheldTransactionFees('Eth')).toJSON(),
         );
         const feeSpentEth = await api.query.ethereumBroadcaster.transactionFeeDeficit.entries();
         let totalSpent = 0;
         feeSpentEth.forEach(([key, element]: [any, any]) => {
-            totalSpent += Number(element.toHuman().replace(/,/g, ''));
+            totalSpent += Number(element.toJSON());
         });
         const deficitEth = (feeWitheldEth - totalSpent) / 1e18;
         metric.labels('ethereum').set(deficitEth);
 
         // DOT fees balance
         const feeWitheldDot = Number(
-            (await api.query.polkadotIngressEgress.withheldTransactionFees('Dot'))
-                .toHuman()
-                .replace(/,/g, ''),
+            (await api.query.polkadotIngressEgress.withheldTransactionFees('Dot')).toJSON(),
         );
         const feeSpentDot = await api.query.polkadotBroadcaster.transactionFeeDeficit.entries();
         totalSpent = 0;
         feeSpentDot.forEach(([key, element]: [any, any]) => {
-            totalSpent += Number(element.toHuman().replace(/,/g, ''));
+            totalSpent += Number(element.toJSON());
         });
         const deficitDot = (feeWitheldDot - totalSpent) / 1e10;
         metric.labels('polkadot').set(deficitDot);

diff --git a/src/metrics/chainflip/gaugePendingRedemptions.ts b/src/metrics/chainflip/gaugePendingRedemptions.ts
@@ -31,7 +31,7 @@ export const gaugePendingRedemptions = async (context: Context): Promise<void> =
         const pendingRedemptions = await api.query.funding.pendingRedemptions.entries();
         let totalRedemptionBalance: number = 0;
         pendingRedemptions.forEach(([key, element]: [any, any]) => {
-            totalRedemptionBalance += parseFloat(element.toHuman().total.replace(/,/g, '')) / 1e18;
+            totalRedemptionBalance += parseInt(element.toJSON().total, 16) / 1e18;
         });
 
         metricPendingRedemptionBalance.set(totalRedemptionBalance);

diff --git a/src/metrics/chainflip/gaugeWitnessChainTracking.ts b/src/metrics/chainflip/gaugeWitnessChainTracking.ts
@@ -35,9 +35,7 @@ export const gaugeWitnessChainTracking = async (context: Context): Promise<void>
         metricFailure.labels({ metric: metricName }).set(0);
         try {
             const signedBlock = await api.rpc.chain.getBlock();
-            const currentBlockNumber = Number(
-                signedBlock.block.header.number.toHuman().replace(/,/g, ''),
-            );
+            const currentBlockNumber = Number(signedBlock.toJSON().block.header.number);
             global.currentBlock = currentBlockNumber;
             toDelete.forEach((block, labels) => {
                 if (block <= currentBlockNumber) {

diff --git a/src/metrics/chainflip/gaugeWitnessCount.ts b/src/metrics/chainflip/gaugeWitnessCount.ts
@@ -35,9 +35,8 @@ export const gaugeWitnessCount = async (context: Context): Promise<void> => {
         metricFailure.labels({ metric: metricName }).set(0);
         try {
             const signedBlock = await api.rpc.chain.getBlock();
-            const currentBlockNumber = Number(
-                signedBlock.block.header.number.toHuman().replace(/,/g, ''),
-            );
+            const currentBlockNumber = Number(signedBlock.toJSON().block.header.number);
+
             toDelete.forEach((block, labels) => {
                 if (block <= currentBlockNumber) {
                     const values = JSON.parse(labels);

diff --git a/src/metrics/chainflip/guageExternalChainsBlockHeight.ts b/src/metrics/chainflip/guageExternalChainsBlockHeight.ts
@@ -19,27 +19,21 @@ export const gaugeExternalChainsBlockHeight = async (context: Context) => {
     try {
         // Ethereum
         const ethBlockHeight = Number(
-            (await api.query.ethereumChainTracking.currentChainState())
-                .toHuman()
-                .blockHeight.replace(/,/g, ''),
+            (await api.query.ethereumChainTracking.currentChainState()).toJSON().blockHeight,
         );
         global.ethHeight = ethBlockHeight;
         metric.labels('ethereum').set(ethBlockHeight);
 
         // Bitcoin
         const btcBlockHeight = Number(
-            (await api.query.bitcoinChainTracking.currentChainState())
-                .toHuman()
-                .blockHeight.replace(/,/g, ''),
+            (await api.query.bitcoinChainTracking.currentChainState()).toJSON().blockHeight,
         );
         global.btcHeight = btcBlockHeight;
         metric.labels('bitcoin').set(btcBlockHeight);
 
         // Polkadot
         const dotBlockHeight = Number(
-            (await api.query.polkadotChainTracking.currentChainState())
-                .toHuman()
-                .blockHeight.replace(/,/g, ''),
+            (await api.query.polkadotChainTracking.currentChainState()).toJSON().blockHeight,
         );
         global.dotHeight = dotBlockHeight;
         metric.labels('polkadot').set(dotBlockHeight);