From 1e091d6aa67a12906169360cd61a35a7dcaecb45 Mon Sep 17 00:00:00 2001 From: garyschulte Date: Fri, 8 Dec 2023 11:09:49 -0800 Subject: [PATCH] re-apply doc and test changes from 033e3c8 Signed-off-by: garyschulte --- besu/src/main/java/org/hyperledger/besu/Runner.java | 5 +++++ .../besu/ethereum/chain/DefaultBlockchain.java | 1 + .../besu/ethereum/chain/DefaultBlockchainTest.java | 8 ++++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/besu/src/main/java/org/hyperledger/besu/Runner.java b/besu/src/main/java/org/hyperledger/besu/Runner.java index 805ded34583..4444f7acf72 100644 --- 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 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 index 95aa0338bff..38f59598460 100644 --- 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 index 66c9ac5593b..83a3eacd3ba 100644 --- 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 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 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