fix: fixing unit tests

Signed-off-by: Matt Peterson <[email protected]>
hashgraph · Nov 19, 2024 · 2c8f15e · 2c8f15e
1 parent 5ff602a
commit 2c8f15e
Show file tree

Hide file tree

Showing 4 changed files with 155 additions and 141 deletions.
diff --git a/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamServiceProxy.java b/server/src/main/java/com/hedera/block/server/pbj/PbjBlockStreamServiceProxy.java
@@ -29,7 +29,6 @@
 import com.hedera.block.server.producer.ProducerBlockItemObserver;
 import com.hedera.block.server.producer.ProducerConfig;
 import com.hedera.block.server.service.ServiceStatus;
-import com.hedera.hapi.block.BlockItemSetUnparsed;
 import com.hedera.hapi.block.BlockItemUnparsed;
 import com.hedera.hapi.block.PublishStreamRequestUnparsed;
 import com.hedera.hapi.block.PublishStreamResponse;
@@ -196,9 +195,7 @@ private Bytes createSubscribeStreamResponse(
     private List<BlockItemUnparsed> parsePublishStreamRequest(
             @NonNull final Bytes message, @NonNull final RequestOptions options) throws ParseException {
         final PublishStreamRequestUnparsed request = PublishStreamRequestUnparsed.PROTOBUF.parse(message);
-        final Bytes b = request.blockItems();
-        final BlockItemSetUnparsed blockItemSet = BlockItemSetUnparsed.PROTOBUF.parse(b);
-        return blockItemSet.blockItems();
+        return request.blockItems().blockItems();
     }
 
     @NonNull

diff --git a/server/src/main/java/com/hedera/block/server/producer/ProducerBlockItemObserver.java b/server/src/main/java/com/hedera/block/server/producer/ProducerBlockItemObserver.java
@@ -125,7 +125,9 @@ public void onNext(@NonNull final List<BlockItemUnparsed> blockItems) {
             livenessCalculator.refresh();
 
             // Publish the block to the mediator
-            publisher.publish(blockItems);
+            if (!blockItems.isEmpty()) {
+                publisher.publish(blockItems);
+            }
 
         } else {
             LOGGER.log(ERROR, getClass().getName() + " is not accepting BlockItems");