resolve test genesis poisioning

ethereumjs · Nov 19, 2022 · a9566e5 · a9566e5
1 parent c27fc98
commit a9566e5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/client/test/rpc/util/CLConnectionManager.spec.ts b/packages/client/test/rpc/util/CLConnectionManager.spec.ts
@@ -42,8 +42,9 @@ tape('[CLConnectionManager]', (t) => {
     st.ok(manager.running, 'should start')
     manager.stop()
     st.ok(!manager.running, 'should stop')
+    const prevMergeForkBlock = (genesisJSON.config as any).mergeForkBlock
     ;(genesisJSON.config as any).mergeForkBlock = 0
-    const params = parseGethGenesis(genesisJSON, 'post-merge')
+    const params = parseGethGenesis(genesisJSON, 'post-merge', false)
     let common = new Common({
       chain: params.name,
       customChains: [params],
@@ -53,7 +54,6 @@ tape('[CLConnectionManager]', (t) => {
     manager = new CLConnectionManager({ config })
     st.ok(manager.running, 'starts on instantiation if hardfork is MergeForkBlock')
     manager.stop()
-    const prevMergeForkBlock = (genesisJSON.config as any).mergeForkBlock
     ;(genesisJSON.config as any).mergeForkBlock = 10
     common = new Common({
       chain: params.name,

diff --git a/packages/common/src/utils.ts b/packages/common/src/utils.ts
@@ -111,7 +111,7 @@ function parseGethParams(json: any, mergeForkIdPostMerge: boolean = true) {
       name: forkMapRev[nameBlock],
       block: config[nameBlock],
     }))
-    .filter((fork) => fork.block !== null)
+    .filter((fork) => fork.block !== null && fork.block !== undefined)
 
   params.hardforks.unshift({ name: Hardfork.Chainstart, block: 0 })