chore: fix test

Author: PhilippLgh

lib/net/server/rlpxserver.ts

@@ -97,7 +97,7 @@ export class RlpxServer extends Server {
         id: undefined,
         ip: this.ip,
         listenAddr: `[${this.ip}]:${this.port}`,
-        ports: { 'discovery': this.port, 'listener': this.port }
+        ports: { discovery: this.port, listener: this.port },
       }
     }
     const id = this.rlpx._id.toString('hex')
@@ -106,7 +106,7 @@ export class RlpxServer extends Server {
       id: id,
       ip: this.ip,
       listenAddr: `[${this.ip}]:${this.port}`,
-      ports: { 'discovery': this.port, 'listener': this.port }
+      ports: { discovery: this.port, listener: this.port },
     }
   }
 
@@ -147,8 +147,8 @@ export class RlpxServer extends Server {
    */
   async stop(): Promise<boolean> {
     if (this.started) {
-      ; (this.rlpx as Devp2pRLPx).destroy() // eslint-disable-line no-extra-semi
-        ; (this.dpt as Devp2pDPT).destroy()
+      ;(this.rlpx as Devp2pRLPx).destroy() // eslint-disable-line no-extra-semi
+      ;(this.dpt as Devp2pDPT).destroy()
       await super.stop()
       this.started = false
     }
@@ -165,7 +165,7 @@ export class RlpxServer extends Server {
     if (!this.started) {
       return false
     }
-    ; (this.dpt as Devp2pDPT).banPeer(peerId, maxAge) // eslint-disable-line no-extra-semi
+    ;(this.dpt as Devp2pDPT).banPeer(peerId, maxAge) // eslint-disable-line no-extra-semi
     return true
   }
 

lib/rpc/modules/admin.ts

@@ -1,7 +1,8 @@
 import { bufferToHex } from 'ethereumjs-util'
 import { Chain } from '../../blockchain'
-import { EthProtocol } from '../../net/protocol'
+import { EthProtocol, Protocol } from '../../net/protocol'
 import Node from '../../node'
+import { Service } from '../../service'
 import { getClientVersion } from '../../util'
 import { middleware } from '../validation'
 
@@ -19,10 +20,10 @@ export class Admin {
    * @param {Node} Node to which the module binds
    */
   constructor(node: Node) {
-    const service = node.services.find(s => s.name === 'eth')
+    const service = node.services.find((s: Service) => s.name === 'eth')
     this._chain = service.chain
     this._node = node
-    this._ethProtocol = service.protocols.find(p => p.name === 'eth')
+    this._ethProtocol = service.protocols.find((p: Protocol) => p.name === 'eth')
 
     this.nodeInfo = middleware(this.nodeInfo.bind(this), 0, [])
   }
@@ -31,21 +32,20 @@ export class Admin {
    * Returns information about the currently running node.
    * see for reference: https://geth.ethereum.org/docs/rpc/ns-admin#admin_nodeinfo
    * @param {*} [params] An empty array
-   * @param {*} [cb] A function with an error object as the first argument and the
+   * @param {*} [cb] A function with an error object as the first argument and the result as the second
    */
-  async nodeInfo(params, cb) {
+  async nodeInfo(params: any, cb: Function) {
     const rlpxInfo = this._node.server('rlpx').getRlpxInfo()
     const { enode, id, ip, listenAddr, ports } = rlpxInfo
     const { discovery, listener } = ports
     const clientName = getClientVersion()
 
     // TODO version not present in reference..
     // const ethVersion = Math.max.apply(Math, this._ethProtocol.versions)
-    // TODO _chain._headers might be undefined
-    const latestHeader = this._chain._headers.latest
-    const difficulty = latestHeader.difficulty // should be number
+    const latestHeader = (this._chain as any)._headers.latest
+    const difficulty = latestHeader?.difficulty || 0 // should be number
     const genesis = bufferToHex(this._chain.genesis.hash)
-    const head = bufferToHex(latestHeader.mixHash)
+    const head = bufferToHex(latestHeader?.mixHash || null)
     const network = this._chain.networkId
 
     const nodeInfo = {
@@ -56,16 +56,16 @@ export class Admin {
       listenAddr,
       ports: {
         discovery,
-        listener
+        listener,
       },
       protocols: {
         eth: {
           difficulty,
           genesis,
           head,
-          network
-        }
-      }
+          network,
+        },
+      },
     }
     return cb(null, nodeInfo)
   }

lib/rpc/modules/index.ts

@@ -1,3 +1,5 @@
+export const list = ['Eth', 'Web3', 'Net', 'Admin']
+
 export * from './eth'
 export * from './web3'
 export * from './net'

lib/rpc/modules/web3.ts

@@ -1,6 +1,5 @@
 import { middleware, validators } from '../validation'
 import { addHexPrefix, keccak, toBuffer } from 'ethereumjs-util'
-import { platform } from 'os'
 import { getClientVersion } from '../../util'
 
 /**

lib/util/index.js

@@ -6,13 +6,13 @@ const { defaultLogger } = require('../../../lib/logging')
 defaultLogger.silent = true
 
 tape('[RlpxServer]', (t) => {
-  class RlpxPeer extends EventEmitter { }
+  class RlpxPeer extends EventEmitter {}
   RlpxPeer.capabilities = td.func()
   RlpxPeer.prototype.accept = td.func()
   td.replace('../../../lib/net/peer/rlpxpeer', RlpxPeer)
-  class RLPx extends EventEmitter { }
+  class RLPx extends EventEmitter {}
   RLPx.prototype.listen = td.func()
-  class DPT extends EventEmitter { }
+  class DPT extends EventEmitter {}
   DPT.prototype.bind = td.func()
   td.replace('ethereumjs-devp2p', { DPT, RLPx })
   td.when(
@@ -75,32 +75,40 @@ tape('[RlpxServer]', (t) => {
   t.test('should return rlpx server info', async (t) => {
     const mockId = '123'
     const server = new RlpxServer({
-      bootnodes: '10.0.0.1:1234,10.0.0.2:1234'
+      bootnodes: '10.0.0.1:1234,10.0.0.2:1234',
     })
     server.initDpt = td.func()
     server.initRlpx = td.func()
     server.dpt = td.object()
     server.rlpx = td.object({
       _id: mockId,
-      destroy: td.func()
+      destroy: td.func(),
     })
-    td.when(server.dpt.bootstrap({ address: '10.0.0.1', udpPort: '1234', tcpPort: '1234' })).thenResolve()
-    td.when(server.dpt.bootstrap({ address: '10.0.0.2', udpPort: '1234', tcpPort: '1234' })).thenReject('err0')
-    server.on('error', err => t.equals(err, 'err0', 'got error'))
+    td.when(
+      server.dpt?.bootstrap({ address: '10.0.0.1', udpPort: '1234', tcpPort: '1234' })
+    ).thenResolve()
+    td.when(
+      server.dpt?.bootstrap({ address: '10.0.0.2', udpPort: '1234', tcpPort: '1234' })
+    ).thenReject('err0')
+    server.on('error', (err) => t.equals(err, 'err0', 'got error'))
     await server.start()
     const nodeInfo = server.getRlpxInfo()
-    t.deepEqual(nodeInfo, {
-      enode: `enode://${mockId}@[::]:30303`,
-      id: mockId,
-      ip: '::',
-      listenAddr: '[::]:30303',
-      ports: { discovery: 30303, listener: 30303 }
-    }, 'get nodeInfo')
+    t.deepEqual(
+      nodeInfo,
+      {
+        enode: `enode://${mockId}@[::]:30303`,
+        id: mockId,
+        ip: '::',
+        listenAddr: '[::]:30303',
+        ports: { discovery: 30303, listener: 30303 },
+      },
+      'get nodeInfo'
+    )
     await server.stop()
     t.end()
   })
 
-  t.test('should handle errors', t => {
+  t.test('should handle errors', (t) => {
     t.plan(3)
     let count = 0
     const server = new RlpxServer()

test/net/server/rlpxserver.ts

@@ -3,23 +3,18 @@ import { startRPC, createManager, createNode, params, baseRequest } from '../hel
 
 const method = 'admin_nodeInfo'
 
-<<<<<<< HEAD:test/rpc/admin/nodeInfo.ts
 tape(method, (t) => {
-=======
-test(method, (t) => {
->>>>>>> chore: improve test:test/rpc/admin/nodeInfo.js
   const manager = createManager(createNode({ opened: true }))
   const server = startRPC(manager.getMethods())
 
   const req = params(method, [])
 
   const expectRes = (res: any) => {
-    const msg = 'should return the correct info'
     const { result } = res.body
     if (result) {
       t.pass('admin_nodeInfo returns a value')
     } else {
-      throw new Error(msg)
+      throw new Error('no return value')
     }
   }
   baseRequest(t, server, req, 200, expectRes)

test/rpc/admin/nodeInfo.ts

@@ -6,7 +6,7 @@ import { RPCManager as Manager } from '../../lib/rpc'
 import * as Logger from '../../lib/logging'
 import { blockChain } from './blockChainStub'
 import { Chain } from '../../lib/blockchain/chain'
-import RlpxServer from '../../lib/net/server/rlpxserver'
+import { RlpxServer } from '../../lib/net/server/rlpxserver'
 import Blockchain from '@ethereumjs/blockchain'
 
 const config: any = { loglevel: 'error' }
@@ -39,8 +39,8 @@ export function createNode(nodeConfig?: any) {
   const trueNodeConfig = { ...defaultNodeConfig, ...nodeConfig }
   const servers = [
     new RlpxServer({
-      bootnodes: '10.0.0.1:1234,10.0.0.2:1234'
-    })
+      bootnodes: '10.0.0.1:1234,10.0.0.2:1234',
+    }),
   ]
   return {
     services: [
@@ -60,8 +60,8 @@ export function createNode(nodeConfig?: any) {
     common: trueNodeConfig.commonChain,
     opened: trueNodeConfig.opened,
     server: (name: string) => {
-      return servers.find(s => s.name === name)
-    }
+      return servers.find((s) => s.name === name)
+    },
   }
 }