fix: versions format and other PR comments

Adamant-im · Feb 26, 2024 · da8359c · da8359c
1 parent 8792ad1
commit da8359c
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 45 deletions.
diff --git a/src/lib/nodes/btc/BtcNode.ts b/src/lib/nodes/btc/BtcNode.ts
@@ -2,7 +2,7 @@ import { createBtcLikeClient } from '../utils/createBtcLikeClient'
 import type { AxiosInstance } from 'axios'
 import { Node } from '@/lib/nodes/abstract.node'
 import { NODE_LABELS } from '@/lib/nodes/constants'
-import { formatBtcVersion } from '@/lib/nodes/utils/formatBtcVersion.ts'
+import { formatBtcVersion } from '@/lib/nodes/utils/nodeVersionFormatters.ts'
 
 type FetchBtcNodeInfoResult = {
   error: string
@@ -43,16 +43,15 @@ export class BtcNode extends Node {
   }
 
   private async fetchNodeVersion(): Promise<void> {
-    try {
-      const { data } = await this.client.post<FetchBtcNodeInfoResult>('/bitcoind', {"jsonrpc":"1.0","id":"adm","method":"getnetworkinfo","params":[]})
-      const v =  data?.result?.version
-      if (v) {
-        this.version = 'v' + formatBtcVersion(v)
-      } else {
-        console.error(data.error)
-      }
-    } catch (e) {
-      console.error(e)
+    const { data } = await this.client.post<FetchBtcNodeInfoResult>('/bitcoind', {
+      jsonrpc: '1.0',
+      id: 'adm',
+      method: 'getnetworkinfo',
+      params: []
+    })
+    const version = data.result.version
+    if (version) {
+      this.version = formatBtcVersion(version)
     }
   }
 }
diff --git a/src/lib/nodes/dash/DashNode.ts b/src/lib/nodes/dash/DashNode.ts
@@ -44,15 +44,11 @@ export class DashNode extends Node {
   }
 
   private async fetchNodeVersion(): Promise<void> {
-    try {
-      const { data } = await this.client.post<FetchNodeVersionResponse>('/', {method:'getnetworkinfo'})
-      if (data?.result.buildversion) {
-        this.version = data.result.buildversion
-      } else {
-        console.error(data.error)
-      }
-    } catch (e) {
-      console.error(e)
+    const { data } = await this.client.post<FetchNodeVersionResponse>('/', {
+      method: 'getnetworkinfo'
+    })
+    if (data.result.buildversion) {
+      this.version = data.result.buildversion
     }
   }
 }
diff --git a/src/lib/nodes/doge/DogeNode.ts b/src/lib/nodes/doge/DogeNode.ts
@@ -2,7 +2,7 @@ import { createBtcLikeClient } from '../utils/createBtcLikeClient'
 import type { AxiosInstance } from 'axios'
 import { Node } from '@/lib/nodes/abstract.node'
 import { NODE_LABELS } from '@/lib/nodes/constants'
-import { formatBtcVersion } from '@/lib/nodes/utils/formatBtcVersion.ts'
+import { formatDogeVersion } from '@/lib/nodes/utils/nodeVersionFormatters.ts'
 
 type FetchBtcNodeInfoResult = {
   info: {
@@ -42,14 +42,9 @@ export class DogeNode extends Node {
   }
 
   private async fetchNodeVersion(): Promise<void> {
-    try {
-      const response = await this.client.get<FetchBtcNodeInfoResult>('/api/status')
-      console.log(response)
-      if (response?.data?.info.version) {
-        this.version = 'v' + formatBtcVersion(response?.data?.info.version)
-      }
-    } catch (e) {
-      console.error(e)
+    const { data } = await this.client.get<FetchBtcNodeInfoResult>('/api/status')
+    if (data.info.version) {
+      this.version = formatDogeVersion(data.info.version)
     }
   }
 }
diff --git a/src/lib/nodes/eth/EthNode.ts b/src/lib/nodes/eth/EthNode.ts
@@ -2,6 +2,7 @@ import Web3Eth from 'web3-eth'
 import { HttpProvider } from 'web3-providers-http'
 import { Node } from '@/lib/nodes/abstract.node'
 import { NODE_LABELS } from '@/lib/nodes/constants'
+import { formatEthVersion } from '@/lib/nodes/utils/nodeVersionFormatters.ts'
 
 /**
  * Encapsulates a node. Provides methods to send API-requests
@@ -38,14 +39,6 @@ export class EthNode extends Node {
   }
 
   private async fetchNodeVersion(): Promise<void> {
-    try {
-      const parts = (await this.client.getNodeInfo()).split('/')
-      const clientName = parts.length > 0 ? parts[0] : ''
-      const fullVersion = parts.length > 1 ? parts[1]: ''
-      const simplifiedVersion = fullVersion.split('-')[0]
-      this.version = `${clientName}/${simplifiedVersion}`
-    } catch (e) {
-      console.error(e)
-    }
+    this.version = formatEthVersion(await this.client.getNodeInfo())
   }
 }
diff --git a/src/lib/nodes/utils/formatBtcVersion.ts b/src/lib/nodes/utils/formatBtcVersion.ts
diff --git a/src/lib/nodes/utils/nodeVersionFormatters.ts b/src/lib/nodes/utils/nodeVersionFormatters.ts
@@ -0,0 +1,30 @@
+export const formatBtcVersion = (version: number) => {
+  const parts = getBtcVersionParts(version)
+  if (parts.length < 3) return ''
+  if (parts[0] === 0) {
+    return `v${parts[0]}.${parts[1]}.${parts[2]}`
+  } else {
+    return `v${parts[0]}.${parts[1]}`
+  }
+}
+
+export const formatDogeVersion = (version: number) => {
+  const parts = getBtcVersionParts(version)
+  if (parts.length < 3) return ''
+  return `v${parts[0]}.${parts[1]}.${parts[2]}`
+}
+
+export const formatEthVersion = (version: string) => {
+  const parts = version.split('/')
+  const clientName = parts.length > 0 ? parts[0] : ''
+  const fullVersion = parts.length > 1 ? parts[1] : ''
+  const simplifiedVersion = fullVersion.split('-')[0]
+  return `${clientName}/${simplifiedVersion}`
+}
+
+export const getBtcVersionParts = (version: number) =>
+  version
+    .toString()
+    .padStart(8, '0')
+    .match(/.{1,2}/g)
+    ?.map((item) => +item) || []