diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 0774e2fca4e..e7205b21f00 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,3 +1,4 @@ + ## PR description ## Fixed Issue(s) diff --git a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java index 929135ae596..a4f267be971 100644 --- a/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java +++ b/ethereum/api/src/main/java/org/hyperledger/besu/ethereum/api/jsonrpc/internal/methods/engine/AbstractEngineNewPayload.java @@ -366,7 +366,7 @@ public JsonRpcResponse syncResponse(final JsonRpcRequestContext requestContext) .mapToInt(List::size) .sum(), lastExecutionTime / 1000.0, - executionResult.getNbParallelizedTransations()); + executionResult.getNbParallelizedTransactions()); return respondWith(reqId, blockParam, newBlockHeader.getHash(), VALID); } else { if (executionResult.causedBy().isPresent()) { @@ -612,7 +612,7 @@ private void logImportedBlockInfo( final Block block, final int blobCount, final double timeInS, - final Optional nbParallelizedTransations) { + final Optional nbParallelizedTransactions) { final StringBuilder message = new StringBuilder(); final int nbTransactions = block.getBody().getTransactions().size(); message.append("Imported #%,d (%s)|%5d tx"); @@ -635,9 +635,9 @@ private void logImportedBlockInfo( (block.getHeader().getGasUsed() * 100.0) / block.getHeader().getGasLimit(), timeInS, mgasPerSec)); - if (nbParallelizedTransations.isPresent()) { + if (nbParallelizedTransactions.isPresent()) { double parallelizedTxPercentage = - (double) (nbParallelizedTransations.get() * 100) / nbTransactions; + (double) (nbParallelizedTransactions.get() * 100) / nbTransactions; message.append("| parallel txs %5.1f%%"); messageArgs.add(parallelizedTxPercentage); } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingResult.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingResult.java index 77276caecde..c4297f77b7b 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingResult.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/BlockProcessingResult.java @@ -26,7 +26,7 @@ public class BlockProcessingResult extends BlockValidationResult { private final Optional yield; private final boolean isPartial; - private Optional nbParallelizedTransations = Optional.empty(); + private Optional nbParallelizedTransactions = Optional.empty(); /** A result indicating that processing failed. */ public static final BlockProcessingResult FAILED = new BlockProcessingResult("processing failed"); @@ -45,15 +45,15 @@ public BlockProcessingResult(final Optional yield) { * A result indicating that processing was successful but incomplete. * * @param yield the outputs of processing a block - * @param nbParallelizedTransations potential number of parallelized transactions during block + * @param nbParallelizedTransactions potential number of parallelized transactions during block * processing */ public BlockProcessingResult( final Optional yield, - final Optional nbParallelizedTransations) { + final Optional nbParallelizedTransactions) { this.yield = yield; this.isPartial = false; - this.nbParallelizedTransations = nbParallelizedTransations; + this.nbParallelizedTransactions = nbParallelizedTransactions; } /** @@ -166,7 +166,7 @@ public Optional> getRequests() { * * @return Optional of parallelized transactions during the block execution */ - public Optional getNbParallelizedTransations() { - return nbParallelizedTransations; + public Optional getNbParallelizedTransactions() { + return nbParallelizedTransactions; } } diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java index bdfbe5065b4..d0e7dd1bd8d 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/MainnetBlockValidator.java @@ -191,7 +191,7 @@ public BlockProcessingResult validateAndProcessBlock( return new BlockProcessingResult( Optional.of(new BlockProcessingOutputs(worldState, receipts, maybeRequests)), - result.getNbParallelizedTransations()); + result.getNbParallelizedTransactions()); } } catch (MerkleTrieException ex) { context.getWorldStateArchive().heal(ex.getMaybeAddress(), ex.getLocation()); diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java index 4f74a893fbf..7d7846414a8 100644 --- a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java +++ b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/ProtocolSpec.java @@ -282,7 +282,7 @@ public EVM getEvm() { } /** - * Returns the TransctionReceiptFactory used in this specification + * Returns the TransactionReceiptFactory used in this specification * * @return the transaction receipt factory */ diff --git a/testfuzz/README.md b/testfuzz/README.md index 8f436d70117..1ca6656edba 100644 --- a/testfuzz/README.md +++ b/testfuzz/README.md @@ -6,7 +6,7 @@ BesuFuzz is where all the besu guided fuzzing tools live. Performs differential fuzzing between Ethereum clients based on the [txparse eofparse](https://github.com/holiman/txparse/blob/main/README.md#eof-parser-eofparse) -format. Note that only the inital `OK` and `err` values are used to determine if +format. Note that only the initial `OK` and `err` values are used to determine if there is a difference. ### Prototypical CLI Usage: