move RPCMethod to type.js and only check one block for error catching.

ethereumjs · Dec 20, 2024 · e3c6780 · e3c6780
1 parent f4b065d
commit e3c6780
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/packages/client/src/rpc/helpers.ts b/packages/client/src/rpc/helpers.ts
@@ -3,6 +3,7 @@ import { BIGINT_0, bigIntToHex, bytesToHex, intToHex } from '@ethereumjs/util'
 import { INTERNAL_ERROR, INVALID_BLOCK, INVALID_PARAMS } from './error-code.js'
 
 import type { Chain } from '../blockchain/index.js'
+import type { RPCMethod } from './types.js'
 import type { Block } from '@ethereumjs/block'
 import type { JSONRPCTx, TypedTransaction } from '@ethereumjs/tx'
 
@@ -13,7 +14,7 @@ type RPCError = {
   data?: string
 }
 
-export function callWithStackTrace(handler: Function, debug: boolean): (...args: any) => any {
+export function callWithStackTrace(handler: Function, debug: boolean): RPCMethod {
   return async (...args: any) => {
     try {
       const res = await handler(...args)

diff --git a/packages/client/src/rpc/modules/admin.ts b/packages/client/src/rpc/modules/admin.ts
@@ -48,7 +48,7 @@ export class Admin {
    * Returns information about the currently running node.
    * see for reference: https://geth.ethereum.org/docs/interacting-with-geth/rpc/ns-admin#admin_peers
    */
-  nodeInfo() {
+  async nodeInfo() {
     const rlpxInfo = this._client.config.server!.getRlpxInfo()
     const { enode, id, ip, listenAddr, ports } = rlpxInfo
     const { discovery, listener } = ports

diff --git a/packages/client/src/rpc/modules/web3.ts b/packages/client/src/rpc/modules/web3.ts
@@ -30,7 +30,7 @@ export class Web3 {
    * Returns the current client version
    * @param params An empty array
    */
-  clientVersion() {
+  async clientVersion() {
     return getClientVersion()
   }
 

diff --git a/packages/client/src/rpc/types.ts b/packages/client/src/rpc/types.ts
@@ -45,3 +45,5 @@ export function toRPCTx(t: TxResult): RPCTx {
   t.to !== null && (rpcTx.to = t.to)
   return rpcTx
 }
+
+export type RPCMethod = (...params: any) => any
diff --git a/packages/client/src/rpc/validation.ts b/packages/client/src/rpc/validation.ts
@@ -1,6 +1,6 @@
 import { INVALID_PARAMS } from './error-code.js'
 
-type RPCMethod = (params: any[]) => any
+import type { RPCMethod } from './types.js'
 
 /**
  * middleware for parameters validation

diff --git a/packages/client/test/rpc/debug/setHead.spec.ts b/packages/client/test/rpc/debug/setHead.spec.ts
@@ -66,7 +66,6 @@ describe(method, async () => {
       validateBlocks: true,
       validateConsensus: false,
     })
-    const blocks = await blockchain.getBlocks(0, 6, 0, false)
     const exec = await testSetup(blockchain)
     await exec.run()
     const newHead = await (exec.vm.blockchain as Blockchain).getIteratorHead!()
@@ -82,10 +81,8 @@ describe(method, async () => {
     const manager = createManager(client)
     const rpc = getRPCClient(startRPC(manager.getMethods()))
 
-    for (let i = 0; i < blocks.length; i++) {
-      const result = await rpc.request(method, [`0x${i}`])
-      assert.equal(result.error.code, -32603)
-      assert.equal(result.error.message, 'Internal error')
-    }
+    const result = await rpc.request(method, ['0x1'])
+    assert.equal(result.error.code, -32603)
+    assert.equal(result.error.message, 'Internal error')
   })
 })