improve integration test

bug fix
Consensys · Oct 31, 2024 · cb269c5 · cb269c5
1 parent 4f00e7e
commit cb269c5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
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
@@ -67,6 +67,7 @@ void importBlobSidecars(
   void publishBlobSidecars(
       final List<BlobSidecar> blobSidecars,
       final BlockPublishingPerformance blockPublishingPerformance) {
+    blockPublishingPerformance.blobSidecarsPublishingInitiated();
     blobSidecarGossipChannel.publishBlobSidecars(blobSidecars).ifExceptionGetsHereRaiseABug();
   }
 }
diff --git a/...src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherPhase0.java b/...src/main/java/tech/pegasys/teku/validator/coordinator/publisher/BlockPublisherPhase0.java
@@ -65,9 +65,8 @@ void importBlobSidecars(
   @Override
   SafeFuture<Void> publishBlock(
       final SignedBeaconBlock block, final BlockPublishingPerformance blockPublishingPerformance) {
-    return blockGossipChannel
-        .publishBlock(block)
-        .alwaysRun(blockPublishingPerformance::blockPublishingInitiated);
+    blockPublishingPerformance.blockPublishingInitiated();
+    return blockGossipChannel.publishBlock(block);
   }
 
   @Override

diff --git a/...main/java/tech/pegasys/teku/ethereum/performance/trackers/BlockPublishingPerformance.java b/...main/java/tech/pegasys/teku/ethereum/performance/trackers/BlockPublishingPerformance.java
@@ -29,7 +29,7 @@ public void builderGetPayload() {}
         public void blobSidecarsPrepared() {}
 
         @Override
-        public void blockAndBlobSidecarsPublishingInitiated() {}
+        public void blobSidecarsPublishingInitiated() {}
 
         @Override
         public void blockPublishingInitiated() {}
@@ -38,7 +38,7 @@ public void blockPublishingInitiated() {}
         public void blockImportCompleted() {}
       };
 
-  void blockAndBlobSidecarsPublishingInitiated();
+  void blobSidecarsPublishingInitiated();
 
   void blockPublishingInitiated();
 

diff --git a/.../java/tech/pegasys/teku/ethereum/performance/trackers/BlockPublishingPerformanceImpl.java b/.../java/tech/pegasys/teku/ethereum/performance/trackers/BlockPublishingPerformanceImpl.java
@@ -67,13 +67,13 @@ public void blobSidecarsPrepared() {
   }
 
   @Override
-  public void blockAndBlobSidecarsPublishingInitiated() {
-    performanceTracker.addEvent("block_and_blob_sidecars_publishing_initiated");
+  public void blockPublishingInitiated() {
+    performanceTracker.addEvent("block_publishing_initiated");
   }
 
   @Override
-  public void blockPublishingInitiated() {
-    performanceTracker.addEvent("block_publishing_initiated");
+  public void blobSidecarsPublishingInitiated() {
+    performanceTracker.addEvent("blob_sidecars_publishing_initiated");
   }
 
   @Override