fix tests

status-im · Jan 24, 2025 · 1b58d95 · 1b58d95
1 parent d4385bf
commit 1b58d95
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/nimbus/beacon/api_handler/api_forkchoice.nim b/nimbus/beacon/api_handler/api_forkchoice.nim
@@ -64,14 +64,14 @@ template validateHeaderTimestamp(header, com, apiVersion) =
           " doesn't support head block with timestamp >= Cancun")
   # See fCUV2 specification No.2 bullet 1
   # https://github.com/ethereum/execution-apis/blob/v1.0.0-beta.4/src/engine/shanghai.md#specification-1
-  # elif com.isShanghaiOrLater(header.timestamp):
-  #   if apiVersion != Version.V2:
-  #     raise invalidAttr("forkChoiceUpdated" & $apiVersion &
-  #         " doesn't support head block with Shanghai timestamp")
-  # else:
-  #   if apiVersion != Version.V1:
-  #     raise invalidAttr("forkChoiceUpdated" & $apiVersion &
-  #         " doesn't support head block with timestamp earlier than Shanghai")
+  elif com.isShanghaiOrLater(header.timestamp):
+    if apiVersion != Version.V2:
+      raise invalidAttr("forkChoiceUpdated" & $apiVersion &
+          " doesn't support head block with Shanghai timestamp")
+  else:
+    if apiVersion != Version.V1:
+      raise invalidAttr("forkChoiceUpdated" & $apiVersion &
+          " doesn't support head block with timestamp earlier than Shanghai")
 
 proc forkchoiceUpdated*(ben: BeaconEngineRef,
                         apiVersion: Version,

diff --git a/nimbus/core/validate.nim b/nimbus/core/validate.nim
@@ -267,7 +267,7 @@ proc validateTxBasic*(
 
     let maxBlobsPerBlock = getMaxBlobsPerBlock(com, fork)
     if tx.versionedHashes.len.uint64 > maxBlobsPerBlock:
-      return err(&"invalid tx: versioned hashes len exceeds MAX_BLOBS_PER_BLOCK={maxBlobsPerBlock}, get={tx.versionedHashes.len}, fork={fork}")
+      return err(&"invalid tx: versioned hashes len exceeds MAX_BLOBS_PER_BLOCK={maxBlobsPerBlock}, get={tx.versionedHashes.len}")
 
     for i, bv in tx.versionedHashes:
       if bv.data[0] != VERSIONED_HASH_VERSION_KZG:

diff --git a/tests/test_genesis.nim b/tests/test_genesis.nim
@@ -171,7 +171,7 @@ proc customGenesisTest() =
       validateBlobSchedule(cg, Osaka, 6, 9)
 
       check loadNetworkParams("blobschedule_prague.json".findFilePath, cg)
-      validateBlobSchedule(cg, Cancun, 0, 0)
+      validateBlobSchedule(cg, Cancun, 3, 6) # default fallback case
       validateBlobSchedule(cg, Prague, 6, 9)
       validateBlobSchedule(cg, Osaka, 6, 9)