Remove deprecated methods from (Signed)BlockContainer (Consensys#7700)

StefanBratanov · Nov 14, 2023 · 708788f · 708788f
1 parent c81d7cc
commit 708788f
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 41 deletions.
diff --git a/beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchImporter.java b/beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchImporter.java
@@ -116,7 +116,7 @@ private SafeFuture<BlockImportResult> importBlockAndBlobSidecars(
         blockRoot);
     // Add blob sidecars to the pool in order for them to be available when the block is being
     // imported
-    blobSidecarPool.onCompletedBlockAndBlobSidecars(block, blobSidecars);
+    blobSidecarPool.onCompletedBlockAndBlobSidecarsOld(block, blobSidecars);
     return importBlock(block, source);
   }
 

diff --git a/beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/singlepeer/PeerSync.java b/beacon/sync/src/main/java/tech/pegasys/teku/beacon/sync/forward/singlepeer/PeerSync.java
@@ -343,7 +343,7 @@ private SafeFuture<Void> importBlock(
     // Add blob sidecars to the pool in order for them to be available when the block is being
     // imported
     maybeBlobSidecars.ifPresent(
-        blobSidecars -> blobSidecarPool.onCompletedBlockAndBlobSidecars(block, blobSidecars));
+        blobSidecars -> blobSidecarPool.onCompletedBlockAndBlobSidecarsOld(block, blobSidecars));
 
     return blockImporter
         .importBlock(block)

diff --git a/...sync/src/test/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchImporterTest.java b/...sync/src/test/java/tech/pegasys/teku/beacon/sync/forward/multipeer/BatchImporterTest.java
@@ -250,7 +250,7 @@ void shouldNotDisconnectPeersWhenServiceOffline() {
 
   private void blobSidecarsImportedSuccessfully(
       final SignedBeaconBlock block, final List<BlobSidecarOld> blobSidecars) {
-    verify(blobSidecarPool).onCompletedBlockAndBlobSidecars(block, blobSidecars);
+    verify(blobSidecarPool).onCompletedBlockAndBlobSidecarsOld(block, blobSidecars);
     verifyNoMoreInteractions(blobSidecarPool);
   }
 

diff --git a/beacon/sync/src/test/java/tech/pegasys/teku/beacon/sync/forward/singlepeer/PeerSyncTest.java b/beacon/sync/src/test/java/tech/pegasys/teku/beacon/sync/forward/singlepeer/PeerSyncTest.java
@@ -558,7 +558,7 @@ private void verifyBlobSidecarsAddedToPool(
         Assertions.fail("Blob sidecars for slot %s is missing", slot);
       }
       verify(blobSidecarPool)
-          .onCompletedBlockAndBlobSidecars(any(), eq(blobSidecarsBySlot.get(slot)));
+          .onCompletedBlockAndBlobSidecarsOld(any(), eq(blobSidecarsBySlot.get(slot)));
     }
   }
 

diff --git a/.../src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherDeneb.java b/.../src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherDeneb.java
@@ -52,12 +52,8 @@ protected SafeFuture<BlockImportAndBroadcastValidationResults> importBlock(
       final SignedBlockContainer blockContainer,
       final BroadcastValidationLevel broadcastValidationLevel) {
     final SignedBeaconBlock block = blockContainer.getSignedBlock();
-
-    blockContainer
-        .getSignedBlobSidecars()
-        .ifPresent(
-            signedBlobSidecars ->
-                blobSidecarPool.onCompletedBlockAndSignedBlobSidecars(block, signedBlobSidecars));
+    // TODO: import blob sidecars with inclusion proof
+    blobSidecarPool.onCompletedBlockAndBlobSidecars(block, List.of());
     return blockImportChannel.importBlock(block, broadcastValidationLevel);
   }
 

diff --git a/...alidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryDenebTest.java b/...alidator/src/test/java/tech/pegasys/teku/validator/coordinator/BlockFactoryDenebTest.java
@@ -109,8 +109,7 @@ void unblindSignedBlock_shouldUnblindBeaconBlock() {
     assertThat(unblindedBlockContainer).isInstanceOf(SignedBlockContents.class);
     assertThat(unblindedBlockContainer.isBlinded()).isFalse();
     assertThat(unblindedBlockContainer.getSignedBlock()).isEqualTo(unblindedBeaconBlock);
-    assertThat(unblindedBlockContainer.getSignedBlobSidecars())
-        .hasValueSatisfying(blobSidecars -> assertThat(blobSidecars).isEmpty());
+    // TODO: add assertions for blobs and proofs
   }
 
   @Override

diff --git a/...idator/src/test/java/tech/pegasys/teku/validator/coordinator/ValidatorApiHandlerTest.java b/...idator/src/test/java/tech/pegasys/teku/validator/coordinator/ValidatorApiHandlerTest.java
@@ -839,7 +839,7 @@ public void sendSignedBlock_shouldConvertBlockContentsSuccessfulResult() {
 
     // TODO: fix assertion for blob sidecars
     verify(blobSidecarGossipChannel).publishBlobSidecars(List.of());
-
+    verify(blobSidecarPool).onCompletedBlockAndBlobSidecars(block, List.of());
     verify(blockGossipChannel).publishBlock(block);
     verify(blockImportChannel).importBlock(block, NOT_REQUIRED);
     assertThat(result).isCompletedWithValue(SendSignedBlockResult.success(block.getRoot()));
@@ -859,7 +859,7 @@ public void sendSignedBlock_shouldConvertBlockContentsFailedResult() {
 
     // TODO: fix assertion for blob sidecars
     verify(blobSidecarGossipChannel).publishBlobSidecars(List.of());
-
+    verify(blobSidecarPool).onCompletedBlockAndBlobSidecars(block, List.of());
     verify(blockGossipChannel).publishBlock(block);
     verify(blockImportChannel).importBlock(block, NOT_REQUIRED);
     assertThat(result)
@@ -881,7 +881,7 @@ public void sendSignedBlockForDeneb_shouldConvertBlockContentsKnownBlockResult()
 
     // TODO: fix assertion for blob sidecars
     verify(blobSidecarGossipChannel).publishBlobSidecars(List.of());
-
+    verify(blobSidecarPool).onCompletedBlockAndBlobSidecars(block, List.of());
     verify(blockGossipChannel).publishBlock(block);
     verify(blockImportChannel).importBlock(block, NOT_REQUIRED);
     assertThat(result).isCompletedWithValue(SendSignedBlockResult.success(block.getRoot()));
@@ -898,8 +898,8 @@ public void sendSignedBlock_shoulNotGossipAndImportBlobsWhenBlobsDoNotExist() {
         validatorApiHandler.sendSignedBlock(block, NOT_REQUIRED);
     safeJoin(result);
 
-    verifyNoInteractions(blobSidecarPool);
     // TODO: fix assertion for blob sidecars (there should be no interactions)
+    verify(blobSidecarPool).onCompletedBlockAndBlobSidecars(block, List.of());
     verify(blobSidecarGossipChannel).publishBlobSidecars(List.of());
     verify(blockGossipChannel).publishBlock(block);
     verify(blockImportChannel).importBlock(block, NOT_REQUIRED);

diff --git a/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/blocks/BlockContainer.java b/ethereum/spec/src/main/java/tech/pegasys/teku/spec/datastructures/blocks/BlockContainer.java
@@ -13,14 +13,12 @@
 
 package tech.pegasys.teku.spec.datastructures.blocks;
 
-import java.util.List;
 import java.util.Optional;
 import tech.pegasys.teku.infrastructure.ssz.SszContainer;
 import tech.pegasys.teku.infrastructure.ssz.SszData;
 import tech.pegasys.teku.infrastructure.ssz.SszList;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
-import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecarOld;
 import tech.pegasys.teku.spec.datastructures.blocks.versions.deneb.BlockContents;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGProof;
 
@@ -37,11 +35,6 @@ default UInt64 getSlot() {
     return getBlock().getSlot();
   }
 
-  @Deprecated
-  default Optional<List<BlobSidecarOld>> getBlobSidecars() {
-    return Optional.empty();
-  }
-
   default Optional<SszList<SszKZGProof>> getKzgProofs() {
     return Optional.empty();
   }

diff --git a/...spec/src/main/java/tech/pegasys/teku/spec/datastructures/blocks/SignedBlockContainer.java b/...spec/src/main/java/tech/pegasys/teku/spec/datastructures/blocks/SignedBlockContainer.java
@@ -13,15 +13,13 @@
 
 package tech.pegasys.teku.spec.datastructures.blocks;
 
-import java.util.List;
 import java.util.Optional;
 import org.apache.tuweni.bytes.Bytes32;
 import tech.pegasys.teku.infrastructure.ssz.SszContainer;
 import tech.pegasys.teku.infrastructure.ssz.SszData;
 import tech.pegasys.teku.infrastructure.ssz.SszList;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.Blob;
-import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.SignedBlobSidecarOld;
 import tech.pegasys.teku.spec.datastructures.blocks.versions.deneb.SignedBlockContents;
 import tech.pegasys.teku.spec.datastructures.type.SszKZGProof;
 
@@ -42,11 +40,6 @@ default Bytes32 getRoot() {
     return getSignedBlock().getRoot();
   }
 
-  @Deprecated
-  default Optional<List<SignedBlobSidecarOld>> getSignedBlobSidecars() {
-    return Optional.empty();
-  }
-
   default Optional<SszList<SszKZGProof>> getKzgProofs() {
     return Optional.empty();
   }

diff --git a/...tatetransition/src/main/java/tech/pegasys/teku/statetransition/blobs/BlobSidecarPool.java b/...tatetransition/src/main/java/tech/pegasys/teku/statetransition/blobs/BlobSidecarPool.java
@@ -20,8 +20,8 @@
 import org.apache.tuweni.bytes.Bytes32;
 import tech.pegasys.teku.ethereum.events.SlotEventsChannel;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecarOld;
-import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.SignedBlobSidecarOld;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.networking.libp2p.rpc.BlobIdentifier;
 
@@ -39,9 +39,13 @@ public void onNewBlobSidecar(final BlobSidecarOld blobSidecar) {}
         public void onNewBlock(final SignedBeaconBlock block) {}
 
         @Override
-        public void onCompletedBlockAndBlobSidecars(
+        public void onCompletedBlockAndBlobSidecarsOld(
             final SignedBeaconBlock block, final List<BlobSidecarOld> blobSidecars) {}
 
+        @Override
+        public void onCompletedBlockAndBlobSidecars(
+            final SignedBeaconBlock block, final List<BlobSidecar> blobSidecars) {}
+
         @Override
         public void removeAllForBlock(final Bytes32 blockRoot) {}
 
@@ -96,13 +100,11 @@ public void subscribeNewBlobSidecar(NewBlobSidecarSubscriber newBlobSidecarSubsc
 
   void onNewBlock(SignedBeaconBlock block);
 
-  default void onCompletedBlockAndSignedBlobSidecars(
-      SignedBeaconBlock block, List<SignedBlobSidecarOld> signedBlobSidecars) {
-    onCompletedBlockAndBlobSidecars(
-        block, signedBlobSidecars.stream().map(SignedBlobSidecarOld::getBlobSidecar).toList());
-  }
+  @Deprecated
+  void onCompletedBlockAndBlobSidecarsOld(
+      SignedBeaconBlock block, List<BlobSidecarOld> blobSidecars);
 
-  void onCompletedBlockAndBlobSidecars(SignedBeaconBlock block, List<BlobSidecarOld> blobSidecars);
+  void onCompletedBlockAndBlobSidecars(SignedBeaconBlock block, List<BlobSidecar> blobSidecars);
 
   void removeAllForBlock(Bytes32 blockRoot);
 

diff --git a/...etransition/src/main/java/tech/pegasys/teku/statetransition/util/BlobSidecarPoolImpl.java b/...etransition/src/main/java/tech/pegasys/teku/statetransition/util/BlobSidecarPoolImpl.java
@@ -36,6 +36,7 @@
 import tech.pegasys.teku.infrastructure.time.TimeProvider;
 import tech.pegasys.teku.infrastructure.unsigned.UInt64;
 import tech.pegasys.teku.spec.Spec;
+import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecar;
 import tech.pegasys.teku.spec.datastructures.blobs.versions.deneb.BlobSidecarOld;
 import tech.pegasys.teku.spec.datastructures.blocks.SignedBeaconBlock;
 import tech.pegasys.teku.spec.datastructures.blocks.SlotAndBlockRoot;
@@ -186,7 +187,7 @@ public synchronized Optional<BlockBlobSidecarsTracker> getBlockBlobSidecarsTrack
   }
 
   @Override
-  public synchronized void onCompletedBlockAndBlobSidecars(
+  public synchronized void onCompletedBlockAndBlobSidecarsOld(
       final SignedBeaconBlock block, final List<BlobSidecarOld> blobSidecars) {
     final SlotAndBlockRoot slotAndBlockRoot = block.getSlotAndBlockRoot();
 
@@ -216,6 +217,12 @@ public synchronized void onCompletedBlockAndBlobSidecars(
     }
   }
 
+  @Override
+  public void onCompletedBlockAndBlobSidecars(
+      final SignedBeaconBlock block, final List<BlobSidecar> blobSidecars) {
+    throw new UnsupportedOperationException("Not yet implemented");
+  }
+
   @Override
   public synchronized void removeAllForBlock(final Bytes32 blockRoot) {
     final BlockBlobSidecarsTracker removedTracker = blockBlobSidecarsTrackers.remove(blockRoot);

diff --git a/...nsition/src/test/java/tech/pegasys/teku/statetransition/util/BlobSidecarPoolImplTest.java b/...nsition/src/test/java/tech/pegasys/teku/statetransition/util/BlobSidecarPoolImplTest.java
@@ -301,7 +301,7 @@ public void onCompletedBlockAndBlobSidecars_shouldCreateTrackerIgnoringHistorica
 
     final List<BlobSidecarOld> blobSidecars = dataStructureUtil.randomBlobSidecarsForBlock(block);
 
-    blobSidecarPool.onCompletedBlockAndBlobSidecars(block, blobSidecars);
+    blobSidecarPool.onCompletedBlockAndBlobSidecarsOld(block, blobSidecars);
 
     assertThat(asyncRunner.hasDelayedActions()).isFalse();
 
@@ -331,7 +331,7 @@ public void onCompletedBlockAndBlobSidecars_shouldNotTriggerFetch() {
 
     final List<BlobSidecarOld> blobSidecars = List.of();
 
-    blobSidecarPool.onCompletedBlockAndBlobSidecars(block, blobSidecars);
+    blobSidecarPool.onCompletedBlockAndBlobSidecarsOld(block, blobSidecars);
 
     assertThat(asyncRunner.hasDelayedActions()).isFalse();