Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

retry block processing #4600

Merged
merged 18 commits into from
Nov 18, 2022
Merged

retry block processing #4600

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
2f089fd
aggresively seeking out other places to defend from this
jflo Nov 3, 2022
7c98b41
interim step requiring an optional exception, should be removed later
jflo Nov 8, 2022
03f60b1
Merge branch 'main' into 4512-merkle-handle
jflo Nov 8, 2022
8cd252c
Merge branch 'main' into 4512-merkle-handle
jflo Nov 8, 2022
e8f8efc
adds test coverage, still needs to cover throwing merkles from block …
jflo Nov 9, 2022
6239984
adds test to throw merkletrie during block iteration
jflo Nov 9, 2022
78dea2e
confirms that bad block manager isn't added to outside of mergeCoordi…
jflo Nov 10, 2022
654e4c2
more testing, spotless
jflo Nov 11, 2022
fe58be1
pr cleanup
jflo Nov 11, 2022
f93d018
Merge branch 'main' into 4512-merkle-handle
jflo Nov 11, 2022
388b5e9
javadoc fix
jflo Nov 11, 2022
8325876
removed unused param
jflo Nov 11, 2022
bf4aaf3
Merge branch 'main' into 4512-merkle-handle
jflo Nov 11, 2022
ccc797f
Merge branch 'main' into 4512-merkle-handle
jflo Nov 17, 2022
ea0f570
adopts pr suggestions
jflo Nov 18, 2022
75cd230
adopts pr suggestions
jflo Nov 18, 2022
6f5058a
Merge branch 'main' into 4512-merkle-handle
jflo Nov 18, 2022
8a347f4
Merge branch 'main' into 4512-merkle-handle
jflo Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
adopts pr suggestions 
Signed-off-by: Justin Florentine <justin+github@florentine.us>
  • Loading branch information
@jflo
jflo committed Nov 18, 2022
commit 75cd230450b7481ba92b9e001deb96ed5bc99a05
1 change: 0 additions & 1 deletion ...rc/test/java/org/hyperledger/besu/consensus/merge/blockcreation/MergeCoordinatorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,6 @@ public void exceptionDuringBuildingBlockShouldNotBeInvalid()

ArgumentCaptor<Block> block = ArgumentCaptor.forClass(Block.class);


verify(mergeContext, times(txPerBlock + 1))
.putPayloadById(eq(payloadId), block.capture()); // +1 for the empty
assertThat(block.getValue().getBody().getTransactions().size()).isEqualTo(txPerBlock);
Expand Down