Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into 494-sync-state-rpc-calls
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/java/com/limechain/chain/lightsyncstate/LightSyncState.java
#	src/main/java/com/limechain/client/LightClient.java
#	src/main/java/com/limechain/storage/DBConstants.java
#	src/main/java/com/limechain/sync/JustificationVerifier.java
#	src/main/java/com/limechain/sync/warpsync/WarpSyncMachine.java
#	src/main/java/com/limechain/sync/warpsync/action/RequestFragmentsAction.java
#	src/main/java/com/limechain/sync/warpsync/action/VerifyJustificationAction.java
#	src/main/java/com/limechain/teavm/HttpRequest.java
  • Loading branch information
Zurcusa committed Aug 30, 2024
2 parents 7faeed8 + bd1797e commit dd94d79
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public void handle(WarpSyncMachine sync) {
}
warpSyncState.setWarpSyncFragmentsFinished(resp.isFinished());
sync.setFragmentsQueue(new ArrayDeque<>(
Arrays.stream(resp.getFragments()).toList())
Arrays.stream(resp.getFragments()).toList())
);

this.result = resp;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public void handle(WarpSyncMachine sync) {
throw new JustificationVerificationException("No such fragment");
}
boolean verified = JustificationVerifier.verify(
fragment.getJustification().getPrecommits(),
fragment.getJustification().getPrecommits(),
fragment.getJustification().getRound());
if (!verified) {
throw new JustificationVerificationException("Justification could not be verified.");
Expand All @@ -69,10 +69,10 @@ public void handle(WarpSyncMachine sync) {
private void handleAuthorityChanges(WarpSyncFragment fragment) {
try {
warpSyncState.handleAuthorityChanges(
fragment.getHeader().getDigest(),
fragment.getHeader().getDigest(),
fragment.getJustification().getTargetBlock());
log.log(Level.INFO, "Verified justification. Block hash is now at #"
+ syncState.getLastFinalizedBlockNumber() + ": "
+ syncState.getLastFinalizedBlockNumber() + ": "
+ syncState.getLastFinalizedBlockHash().toString()
+ " with state root " + syncState.getStateRoot());
} catch (Exception e) {
Expand Down

0 comments on commit dd94d79

Please sign in to comment.