Clean up pivot selector from peers and unit test #8020
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Matilda Clerke <[email protected]>
…ForPeer method Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
…' into clean-up-PivotSelectorFromPeers-and-unit-test
…t tests Signed-off-by: Matilda Clerke <[email protected]>
…eers-method # Conflicts: # ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActions.java # ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotBlockConfirmer.java # ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromSafeBlock.java # ethereum/eth/src/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/FastSyncActionsTest.java
Signed-off-by: Matilda Clerke <[email protected]>
…' into clean-up-PivotSelectorFromPeers-and-unit-test
…ode back separate thread to avoid infinite loop waiting for peers during acceptance tests Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
…en waiting for peers Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
…' into clean-up-PivotSelectorFromPeers-and-unit-test
Signed-off-by: Matilda Clerke <[email protected]>
Signed-off-by: Matilda Clerke <[email protected]>
…nd-unit-test # Conflicts: # ethereum/eth/src/main/java/org/hyperledger/besu/ethereum/eth/manager/task/AbstractRetryingPeerTask.java
macfarla
reviewed
Dec 19, 2024
...rc/test/java/org/hyperledger/besu/ethereum/eth/sync/fastsync/PivotSelectorFromPeersTest.java
Outdated
Show resolved
Hide resolved
Signed-off-by: Matilda Clerke <[email protected]>
macfarla
approved these changes
Dec 19, 2024
| } | ||
|
|
||
| private boolean canPeerDeterminePivotBlock(final EthPeer peer) { | ||
| LOG.debug( |
There was a problem hiding this comment.
we're losing this log line, is that intentional?
There was a problem hiding this comment.
It's not a particularly good log as it doesn't include any context and is likely to end up listing peers. I can look to add something similar if you think it's worthwhile
There was a problem hiding this comment.
all good just checking it won't be missed
garyschulte
pushed a commit
that referenced
this pull request
Dec 20, 2024
* 7582: Add waitForPeer method to PeerSelector and EthPeers Signed-off-by: Matilda Clerke <[email protected]> * 7582: Replace all usages of WaitForPeer[s]Task with new EthPeers.waitForPeer method Signed-off-by: Matilda Clerke <[email protected]> * 7582: Fix PivotBlockConfirmerTest Signed-off-by: Matilda Clerke <[email protected]> * 7582: spotless Signed-off-by: Matilda Clerke <[email protected]> * 7582: Fix broken PivotBlockRetrieverTest Signed-off-by: Matilda Clerke <[email protected]> * 7582: Fix broken FastSyncActionsTest Signed-off-by: Matilda Clerke <[email protected]> * 7582: spotless Signed-off-by: Matilda Clerke <[email protected]> * 7582: Simplify PivotSelectorFromPeers.selectNewPivotBlock and add unit tests Signed-off-by: Matilda Clerke <[email protected]> * 7582: Fix issues after merge Signed-off-by: Matilda Clerke <[email protected]> * 7582: Put AbstractSyncTargetManager.waitForPeerAndThenSetSyncTarget code back separate thread to avoid infinite loop waiting for peers during acceptance tests Signed-off-by: Matilda Clerke <[email protected]> * 7582: Remove pivot block checks when waiting for peer in FastSyncActions Signed-off-by: Matilda Clerke <[email protected]> * 7582: Remove estimated chain height check from PivotBlockConfirmer when waiting for peers Signed-off-by: Matilda Clerke <[email protected]> * 7582: Fix broken PivotBlockRetrieverTest Signed-off-by: Matilda Clerke <[email protected]> * Fix compile errors Signed-off-by: Matilda Clerke <[email protected]> * spotless Signed-off-by: Matilda Clerke <[email protected]> * Refactor mockito usage Signed-off-by: Matilda Clerke <[email protected]> --------- Signed-off-by: Matilda Clerke <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
PR description
Simplify the code in PivotSelectorFromPeers.