fixup! BlobSidecarsByRoot RPC handler

prysmaticlabs · Jun 6, 2023 · 6c95c4b · 6c95c4b
1 parent a647024
commit 6c95c4b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/beacon-chain/sync/BUILD.bazel b/beacon-chain/sync/BUILD.bazel
@@ -90,6 +90,7 @@ go_library(
         "//cache/lru:go_default_library",
         "//cmd/beacon-chain/flags:go_default_library",
         "//config/features:go_default_library",
+        "//config/fieldparams:go_default_library",
         "//config/params:go_default_library",
         "//consensus-types/blocks:go_default_library",
         "//consensus-types/interfaces:go_default_library",

diff --git a/beacon-chain/sync/blobs_test.go b/beacon-chain/sync/blobs_test.go
@@ -84,7 +84,7 @@ func generateTestBlockWithSidecars(t *testing.T, parent [32]byte, slot types.Slo
 		Timestamp:     0,
 		ExtraData:     make([]byte, 0),
 		BaseFeePerGas: bytesutil.PadTo([]byte("baseFeePerGas"), fieldparams.RootLength),
-		ExcessDataGas: bytesutil.PadTo([]byte("excessDataGas"), fieldparams.RootLength),
+		ExcessDataGas: 0,
 		BlockHash:     blockHash[:],
 		Transactions:  encodedBinaryTxs,
 	}
@@ -163,7 +163,7 @@ func (c *blobsTestCase) setup(t *testing.T) (*Service, []*ethpb.BlobSidecar, fun
 	cleanup := func() {
 		require.NoError(t, undo())
 	}
-	maxBlobs := int(params.BeaconConfig().MaxBlobsPerBlock)
+	maxBlobs := fieldparams.MaxBlobsPerBlock
 	chain, clock := defaultMockChain(t)
 	if c.chain == nil {
 		c.chain = chain
@@ -201,7 +201,7 @@ func (c *blobsTestCase) setup(t *testing.T) (*Service, []*ethpb.BlobSidecar, fun
 		rateLimiter: newRateLimiter(client),
 	}
 
-	byRootRate := params.BeaconNetworkConfig().MaxRequestBlobsSidecars * params.BeaconConfig().MaxBlobsPerBlock
+	byRootRate := params.BeaconNetworkConfig().MaxRequestBlobsSidecars * fieldparams.MaxBlobsPerBlock
 	s.setRateCollector(p2p.RPCBlobSidecarsByRootTopicV1, leakybucket.NewCollector(0.000001, int64(byRootRate), time.Second, false))
 
 	return s, sidecars, cleanup
@@ -318,7 +318,7 @@ func TestRoundTripDenebSave(t *testing.T) {
 	c.clock = clock
 	oldest, err := slots.EpochStart(blobMinReqEpoch(c.chain.FinalizedCheckPoint.Epoch, slots.ToEpoch(c.clock.CurrentSlot())))
 	require.NoError(t, err)
-	maxBlobs := int(params.BeaconConfig().MaxBlobsPerBlock)
+	maxBlobs := fieldparams.MaxBlobsPerBlock
 	block, bsc := generateTestBlockWithSidecars(t, parentRoot, oldest, maxBlobs)
 	require.Equal(t, len(block.Block.Body.BlobKzgCommitments), len(bsc))
 	require.Equal(t, maxBlobs, len(bsc))