Update for @ethereumjs/block @ethereumjs/common: test/

Author: cgewecke

test/integration/mocks/mockchain.ts

@@ -1,4 +1,5 @@
-const Block = require('ethereumjs-block')
+import { BN } from 'ethereumjs-util'
+import { Block, BlockHeader } from '@ethereumjs/block'
 import { Chain } from '../../../lib/blockchain'
 
 const defaultOptions = {
@@ -26,12 +27,12 @@ export default class MockChain extends Chain {
     const blocks: any[] = []
     for (let number = 0; number < this.height; number++) {
       blocks.push(
-        new Block({
-          header: {
-            number: number + 1,
-            difficulty: 1,
+        Block.fromBlockData({
+          header: BlockHeader.fromHeaderData({
+            number: new BN(number + 1),
+            difficulty: new BN(1),
             parentHash: number ? blocks[number - 1].hash() : (this.genesis as any).hash,
-          },
+          }),
         })
       )
     }

test/rpc/blockChainStub.ts

@@ -9,8 +9,8 @@ export function blockChain(options: any) {
     }),
   }
   return {
-    getBlock: (data: any, cb: (err: null, val: any) => void) => {
-      return cb(null, block)
+    getBlock: async function (_data: any) {
+      return Promise.resolve(block)
     },
   }
 }

test/rpc/eth/getBlockNumber.ts

@@ -1,15 +1,15 @@
 import tape from 'tape'
-import { toBuffer, intToHex } from 'ethereumjs-util'
+import { intToHex, BN } from 'ethereumjs-util'
 import { startRPC, createManager, createNode, params, baseRequest } from '../helpers'
 
 const method = 'eth_blockNumber'
 
 tape(`${method}: call with valid arguments`, (t) => {
   const mockBlockNumber = 123
   const mockBlockChain = {
-    getLatestHeader: () => {
+    getLatestHeader: async function (): Promise<any> {
       return Promise.resolve({
-        number: toBuffer(mockBlockNumber),
+        number: new BN(mockBlockNumber),
       })
     },
   }

test/rpc/helpers.ts

@@ -1,7 +1,7 @@
 import tape from 'tape'
 const jayson = require('jayson')
 const request = require('supertest')
-import Common from 'ethereumjs-common'
+import Common from '@ethereumjs/common'
 import { RPCManager as Manager } from '../../lib/rpc'
 import * as Logger from '../../lib/logging'
 import { blockChain } from './blockChainStub'
@@ -26,12 +26,12 @@ export function createManager(node: any) {
 }
 
 export function createNode(nodeConfig?: any) {
-  const chain = new Chain({ blockchain: blockChain({}) })
+  const chain = new Chain({ blockchain: (<unknown>blockChain({})) as Chain })
   chain.opened = true
   const defaultNodeConfig = {
     blockchain: chain,
     opened: true,
-    commonChain: new Common('mainnet'),
+    commonChain: new Common({ chain: 'mainnet' }),
     ethProtocolVersions: [63],
   }
   const trueNodeConfig = { ...defaultNodeConfig, ...nodeConfig }

test/rpc/net/version.ts

@@ -1,5 +1,5 @@
 import tape from 'tape'
-import Common from 'ethereumjs-common'
+import Common from '@ethereumjs/common'
 import { startRPC, createManager, createNode, baseSetup, params, baseRequest } from '../helpers'
 
 const method = 'net_version'
@@ -28,7 +28,9 @@ function compareResult(t: any, result: any, chainId: any) {
 }
 
 tape(`${method}: call on ropsten`, (t) => {
-  const manager = createManager(createNode({ opened: true, commonChain: new Common('ropsten') }))
+  const manager = createManager(
+    createNode({ opened: true, commonChain: new Common({ chain: 'ropsten' }) })
+  )
   const server = startRPC(manager.getMethods())
 
   const req = params(method, [])
@@ -51,7 +53,9 @@ tape(`${method}: call on mainnet`, (t) => {
 })
 
 tape(`${method}: call on rinkeby`, (t) => {
-  const manager = createManager(createNode({ opened: true, commonChain: new Common('rinkeby') }))
+  const manager = createManager(
+    createNode({ opened: true, commonChain: new Common({ chain: 'rinkeby' }) })
+  )
   const server = startRPC(manager.getMethods())
 
   const req = params(method, [])
@@ -63,7 +67,9 @@ tape(`${method}: call on rinkeby`, (t) => {
 })
 
 tape(`${method}: call on kovan`, (t) => {
-  const manager = createManager(createNode({ opened: true, commonChain: new Common('kovan') }))
+  const manager = createManager(
+    createNode({ opened: true, commonChain: new Common({ chain: 'kovan' }) })
+  )
   const server = startRPC(manager.getMethods())
 
   const req = params(method, [])
@@ -75,7 +81,9 @@ tape(`${method}: call on kovan`, (t) => {
 })
 
 tape(`${method}: call on goerli`, (t) => {
-  const manager = createManager(createNode({ opened: true, commonChain: new Common('goerli') }))
+  const manager = createManager(
+    createNode({ opened: true, commonChain: new Common({ chain: 'goerli' }) })
+  )
   const server = startRPC(manager.getMethods())
 
   const req = params(method, [])