From 97118784a822eb277371aec84a86374edb0d4440 Mon Sep 17 00:00:00 2001 From: Dmitrii Shmatko Date: Mon, 3 Feb 2025 20:43:12 +0100 Subject: [PATCH] Refactor a bit --- .../util/BlockBlobSidecarsTrackersPoolImpl.java | 17 +++++++++-------- .../teku/statetransition/util/PoolFactory.java | 12 ++++++------ ...ockBlobSidecarsTrackersPoolImplFuluTest.java | 4 ++-- .../BlockBlobSidecarsTrackersPoolImplTest.java | 2 +- .../beaconchain/BeaconChainController.java | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java index 2daf41f73e7..a9779f27e39 100644 --- a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java +++ b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImpl.java @@ -114,6 +114,10 @@ public class BlockBlobSidecarsTrackersPoolImpl extends AbstractIgnoringFutureHis private final BlockBlobSidecarsTrackerFactory trackerFactory; + private final boolean isSuperNode; + private final Consumer> dataColumnSidecarPublisher; + private final KZG kzg; + private final Subscribers requiredBlockRootSubscribers = Subscribers.create(true); private final Subscribers @@ -131,10 +135,7 @@ public class BlockBlobSidecarsTrackersPoolImpl extends AbstractIgnoringFutureHis private final BlockImportChannel blockImportChannel; - private final boolean isSuperNode; private final AtomicBoolean isActiveSuperNode = new AtomicBoolean(false); - private final Consumer> dataColumnSidecarPublisher; - private final Supplier kzgSupplier; BlockBlobSidecarsTrackersPoolImpl( final BlockImportChannel blockImportChannel, @@ -151,7 +152,7 @@ public class BlockBlobSidecarsTrackersPoolImpl extends AbstractIgnoringFutureHis final UInt64 futureSlotTolerance, final int maxTrackers, final boolean isSuperNode, - final Supplier kzgSupplier, + final KZG kzg, final Consumer> dataColumnSidecarPublisher) { super(spec, futureSlotTolerance, historicalSlotTolerance); this.blockImportChannel = blockImportChannel; @@ -167,7 +168,7 @@ public class BlockBlobSidecarsTrackersPoolImpl extends AbstractIgnoringFutureHis this.poolStatsCounters = poolStatsCounters; this.trackerFactory = BlockBlobSidecarsTracker::new; this.isSuperNode = isSuperNode; - this.kzgSupplier = kzgSupplier; + this.kzg = kzg; this.dataColumnSidecarPublisher = dataColumnSidecarPublisher; initMetrics(sizeGauge, poolStatsCounters); @@ -190,7 +191,7 @@ public class BlockBlobSidecarsTrackersPoolImpl extends AbstractIgnoringFutureHis final int maxTrackers, final BlockBlobSidecarsTrackerFactory trackerFactory, final boolean isSuperNode, - final Supplier kzgSupplier, + final KZG kzg, final Consumer> dataColumnSidecarPublisher) { super(spec, futureSlotTolerance, historicalSlotTolerance); this.blockImportChannel = blockImportChannel; @@ -206,7 +207,7 @@ public class BlockBlobSidecarsTrackersPoolImpl extends AbstractIgnoringFutureHis this.poolStatsCounters = poolStatsCounters; this.trackerFactory = trackerFactory; this.isSuperNode = isSuperNode; - this.kzgSupplier = kzgSupplier; + this.kzg = kzg; this.dataColumnSidecarPublisher = dataColumnSidecarPublisher; initMetrics(sizeGauge, poolStatsCounters); @@ -304,7 +305,7 @@ private void publishRecoveredDataColumnSidecars( blockBlobSidecarsTracker.getBlobSidecars().values().stream() .map(BlobSidecar::getBlob) .toList(), - kzgSupplier.get()); + kzg); LOG.info( "Publishing {} data column sidecars for {}", dataColumnSidecars.size(), diff --git a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/PoolFactory.java b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/PoolFactory.java index 2856c762c02..ed66f90ea54 100644 --- a/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/PoolFactory.java +++ b/ethereum/statetransition/src/main/java/tech/pegasys/teku/statetransition/util/PoolFactory.java @@ -127,7 +127,7 @@ public BlockBlobSidecarsTrackersPoolImpl createPoolForBlockBlobSidecarsTrackers( final Supplier gossipValidatorSupplier, final Function> blobSidecarGossipPublisher, final boolean isSuperNode, - final Supplier kzgSupplier, + final KZG kzg, final Consumer> dataColumnSidecarPublisher) { return createPoolForBlockBlobSidecarsTrackers( blockImportChannel, @@ -142,7 +142,7 @@ public BlockBlobSidecarsTrackersPoolImpl createPoolForBlockBlobSidecarsTrackers( FutureItems.DEFAULT_FUTURE_SLOT_TOLERANCE, DEFAULT_MAX_BLOCKS, isSuperNode, - kzgSupplier, + kzg, dataColumnSidecarPublisher); } @@ -159,7 +159,7 @@ public BlockBlobSidecarsTrackersPoolImpl createPoolForBlockBlobSidecarsTrackers( final UInt64 futureBlockTolerance, final int maxTrackers, final boolean isSuperNode, - final Supplier kzgSupplier, + final KZG kzg, final Consumer> dataColumnSidecarPublisher) { return new BlockBlobSidecarsTrackersPoolImpl( blockImportChannel, @@ -176,7 +176,7 @@ public BlockBlobSidecarsTrackersPoolImpl createPoolForBlockBlobSidecarsTrackers( futureBlockTolerance, maxTrackers, isSuperNode, - kzgSupplier, + kzg, dataColumnSidecarPublisher); } @@ -195,7 +195,7 @@ BlockBlobSidecarsTrackersPoolImpl createPoolForBlockBlobSidecarsTrackers( final int maxItems, final BlockBlobSidecarsTrackerFactory trackerFactory, final boolean isSuperNode, - final Supplier kzgSupplier, + final KZG kzg, final Consumer> dataColumnSidecarPublisher) { return new BlockBlobSidecarsTrackersPoolImpl( blockImportChannel, @@ -213,7 +213,7 @@ BlockBlobSidecarsTrackersPoolImpl createPoolForBlockBlobSidecarsTrackers( maxItems, trackerFactory, isSuperNode, - kzgSupplier, + kzg, dataColumnSidecarPublisher); } } diff --git a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplFuluTest.java b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplFuluTest.java index 9fc6e6889aa..bbe454f2ad2 100644 --- a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplFuluTest.java +++ b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplFuluTest.java @@ -105,7 +105,7 @@ public class BlockBlobSidecarsTrackersPoolImplFuluTest { maxItems, BlockBlobSidecarsTracker::new, true, - () -> kzg, + kzg, dataColumnSidecarPublisher); private UInt64 currentSlot = historicalTolerance.times(2); @@ -143,7 +143,7 @@ public void onNewBlockNonSuperNode_shouldIgnoreFuluBlocks() { maxItems, BlockBlobSidecarsTracker::new, false, - () -> KZG.NOOP, + KZG.NOOP, __ -> {}); final SignedBeaconBlock block = dataStructureUtil.randomSignedBeaconBlock(currentSlot.longValue()); diff --git a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplTest.java b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplTest.java index 9f1b29f020d..70f583c20eb 100644 --- a/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplTest.java +++ b/ethereum/statetransition/src/test/java/tech/pegasys/teku/statetransition/util/BlockBlobSidecarsTrackersPoolImplTest.java @@ -105,7 +105,7 @@ public class BlockBlobSidecarsTrackersPoolImplTest { maxItems, this::trackerFactory, false, - () -> KZG.NOOP, + KZG.NOOP, __ -> {}); private UInt64 currentSlot = historicalTolerance.times(2); diff --git a/services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java b/services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java index d9cc478aad4..9b9b05cbcbc 100644 --- a/services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java +++ b/services/beaconchain/src/main/java/tech/pegasys/teku/services/beaconchain/BeaconChainController.java @@ -905,7 +905,7 @@ protected void initBlockBlobSidecarsTrackersPool() { () -> blobSidecarValidator, blobSidecarGossipChannel::publishBlobSidecar, isSuperNode, - () -> kzg, + kzg, dataColumnSidecarPublisher); eventChannels.subscribe(FinalizedCheckpointChannel.class, pool); blockBlobSidecarsTrackersPool = pool;