Skip to content

Remove unnecessary PoS checkpoint methods and variables #6603

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

Merged
gfukushima merged 3 commits into from
Feb 26, 2024
Merged

Remove unnecessary PoS checkpoint methods and variables #6603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
abca6d4
remove unnecessary PoS checkpoint methods and variables
gfukushima Feb 22, 2024
7a3329e
Merge branch 'main' into pos-checkpoint-sync-clean-up
gfukushima Feb 23, 2024
4579369
Merge branch 'main' into pos-checkpoint-sync-clean-up
gfukushima Feb 26, 2024
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
1 change: 0 additions & 1 deletion besu/src/main/java/org/hyperledger/besu/controller/MergeBesuControllerBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ protected MergeContext createConsensusContext(
.getTerminalTotalDifficulty()
.map(Difficulty::of)
.orElse(Difficulty.ZERO))
.setCheckpointPostMergeSync(syncConfig.isCheckpointPostMergeEnabled())
.setPostMergeAtGenesis(isPostMergeAtGenesis);

blockchain
Expand Down
7 changes: 0 additions & 7 deletions consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/MergeContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,13 +185,6 @@ default boolean isChainPruningEnabled() {
return false;
}

/**
* Is checkpoint post merge sync.
*
* @return the boolean
*/
boolean isCheckpointPostMergeSync();

/**
* Is configured for a post-merge from genesis.
*
Expand Down
18 changes: 0 additions & 18 deletions consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/PostMergeContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ public class PostMergeContext implements MergeContext {
private final AtomicReference<Optional<BlockHeader>> terminalPoWBlock =
new AtomicReference<>(Optional.empty());
private final BlockValueCalculator blockValueCalculator = new BlockValueCalculator();
private boolean isCheckpointPostMergeSync;
private boolean isPostMergeAtGenesis;

// TODO: cleanup - isChainPruningEnabled will not be required after
Expand All @@ -92,7 +91,6 @@ public class PostMergeContext implements MergeContext {
PostMergeContext(final Difficulty difficulty) {
this.terminalTotalDifficulty = new AtomicReference<>(difficulty);
this.syncState = new AtomicReference<>();
this.isCheckpointPostMergeSync = false;
}

/**
Expand Down Expand Up @@ -314,22 +312,6 @@ public boolean isChainPruningEnabled() {
return isChainPruningEnabled;
}

/**
* Sets checkpoint post merge sync.
*
* @param isCheckpointPostMergeSync the is checkpoint post merge sync
* @return the checkpoint post merge sync
*/
public PostMergeContext setCheckpointPostMergeSync(final boolean isCheckpointPostMergeSync) {
this.isCheckpointPostMergeSync = isCheckpointPostMergeSync;
return this;
}

@Override
public boolean isCheckpointPostMergeSync() {
return this.isCheckpointPostMergeSync;
}

@Override
public boolean isPostMergeAtGenesis() {
return this.isPostMergeAtGenesis;
Expand Down
5 changes: 0 additions & 5 deletions consensus/merge/src/main/java/org/hyperledger/besu/consensus/merge/TransitionContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,11 +149,6 @@ public Optional<BlockWithReceipts> retrieveBlockById(final PayloadIdentifier pay
return postMergeContext.retrieveBlockById(payloadId);
}

@Override
public boolean isCheckpointPostMergeSync() {
return false;
}

@Override
public boolean isPostMergeAtGenesis() {
return postMergeContext.isPostMergeAtGenesis();
Expand Down