re-apply doc and test changes from 033e3c8

Signed-off-by: garyschulte <[email protected]>
hyperledger · Dec 8, 2023 · 1e091d6 · 1e091d6
1 parent 240a3ac
commit 1e091d6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/besu/src/main/java/org/hyperledger/besu/Runner.java b/besu/src/main/java/org/hyperledger/besu/Runner.java
@@ -423,6 +423,11 @@ Optional<EnodeURL> getLocalEnode() {
     return networkRunner.getNetwork().getLocalEnode();
   }
 
+  /**
+   * get P2PNetwork service.
+   *
+   * @return p2p network service.
+   */
   public P2PNetwork getP2PNetwork() {
     return networkRunner.getNetwork();
   }

diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchain.java
@@ -409,6 +409,7 @@ private boolean blockShouldBeProcessed(
   private void appendBlockHelper(
       final BlockWithReceipts blockWithReceipts, final boolean storeOnly) {
 
+    // TODO: before merging fleet-mode, re-enable this check
     /*if (!blockShouldBeProcessed(blockWithReceipts.getBlock(), blockWithReceipts.getReceipts())) {
       return;
     }*/

diff --git a/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java b/ethereum/core/src/test/java/org/hyperledger/besu/ethereum/chain/DefaultBlockchainTest.java
@@ -243,8 +243,10 @@ public void appendUnconnectedBlock() {
         new BlockDataGenerator.BlockOptions().setBlockNumber(1L).setParentHash(Hash.ZERO);
     final Block newBlock = gen.block(options);
     final List<TransactionReceipt> receipts = gen.receipts(newBlock);
+    // TODO: before merging fleet-mode, change back to IllegalArgumentException
     assertThatThrownBy(() -> blockchain.appendBlock(newBlock, receipts))
-        .isInstanceOf(IllegalArgumentException.class);
+        // .isInstanceOf(IllegalArgumentException.class);
+        .isInstanceOf(IllegalStateException.class);
   }
 
   @Test
@@ -264,8 +266,10 @@ public void appendBlockWithMismatchedReceipts() {
     final Block newBlock = gen.block(options);
     final List<TransactionReceipt> receipts = gen.receipts(newBlock);
     receipts.add(gen.receipt());
+    // TODO: before merging fleet-mode, change back to IllegalArgumentException
     assertThatThrownBy(() -> blockchain.appendBlock(newBlock, receipts))
-        .isInstanceOf(IllegalArgumentException.class);
+        // .isInstanceOf(IllegalArgumentException.class);
+        .isInstanceOf(IndexOutOfBoundsException.class);
   }
 
   @Test