remove fallback pattern

ethereumjs · Jan 22, 2025 · cf59eff · cf59eff
1 parent afe3fa6
commit cf59eff
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 13 deletions.
diff --git a/packages/portalnetwork/src/client/eth.ts b/packages/portalnetwork/src/client/eth.ts
@@ -75,12 +75,6 @@ export class ETH {
       lookupResponse = await lookup.startLookup()
       this.logger.extend('getBlockByHash')(lookupResponse)
       if (!lookupResponse || !('content' in lookupResponse)) {
-        // Header not found by hash, try to find by number if known
-        const blockNumber = this.history!.blockHashToNumber(blockHash)
-        if (blockNumber !== undefined) {
-          const block = await this.getBlockByNumber(blockNumber, includeTransactions)
-          return block
-        }
         return undefined
       } else {
         header = lookupResponse.content
@@ -177,13 +171,9 @@ export class ETH {
         // Body not found by hash.  Reassemble block without body
         return reassembleBlock(header)
       }
-    } else {
-      // Header not found by number.  If block hash is known, search for header by hash
-      const blockHash = this.history!.blockNumberToHash(BigInt(blockNumber))
-      if (blockHash !== undefined) {
-        return this.getBlockByHash(blockHash, includeTransactions)
-      }
     }
+    // Block not found by number
+    return undefined
   }
 
   /**

diff --git a/...test/client/eth/ethGetBlockByHash.spec.ts → ...etwork/test/client/eth/getBlockBy.spec.ts b/...test/client/eth/ethGetBlockByHash.spec.ts → ...etwork/test/client/eth/getBlockBy.spec.ts
@@ -14,5 +14,13 @@ describe('getBlockByHash', async () => {
         await history.indexBlockHash(21591997n, blockHash)
         const block = await ultralight.ETH.getBlockByHash(hexToBytes(blockHash), false)
         assert.equal(block, undefined)
-    }, 3000)
+    })
+    it('should not find a block by number', async () => {
+        const blockNumber = 21591997n
+        const blockHash = '0x1e98ea9bdf6e44eaed730041682e7db748812d5baef84a38435c8ad5f6c5d1e2'
+        const history = ultralight.networks.get(NetworkId.HistoryNetwork) as HistoryNetwork
+        await history.indexBlockHash(blockNumber, blockHash)
+        const block = await ultralight.ETH.getBlockByNumber(blockNumber, false)
+        assert.equal(block, undefined)
+    })
 })