Skip to content

Nit improvements on fix-frontier-root #18120

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

Draft
glyh wants to merge 2 commits into
base: georgeee/fix-frontier-root
Choose a base branch
from
Draft

Nit improvements on fix-frontier-root #18120

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1dcb88
fix_persistent_frontier: simplify check_directories_exist
glyh Nov 17, 2025
23e121f
fix_persistent_frontier: report final state hash after all pending tr…
glyh Nov 17, 2025
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
50 changes: 25 additions & 25 deletions src/app/cli/src/init/fix_persistent_frontier.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,24 +22,21 @@ let rec build_path_to_root ~(frontier : Transition_frontier.t) ~current_hash

let check_directories_exist ~logger ~persistent_root_location
~persistent_frontier_location =
let%bind root_exists =
Sys.file_exists persistent_root_location
>>| function `Yes -> true | `No | `Unknown -> false
in
let%bind frontier_exists =
Sys.file_exists persistent_frontier_location
>>| function `Yes -> true | `No | `Unknown -> false
in
if not root_exists then (
[%log' error logger] "Persistent root directory not found at $location"
~metadata:[ ("location", `String persistent_root_location) ] ;
Deferred.return (Error "Persistent root not found - nothing to fix against")
)
else if not frontier_exists then (
[%log' info logger]
"Persistent frontier directory not found - nothing to fix" ;
Deferred.return (Ok `No_frontier) )
else Deferred.return (Ok `Both_exist)
match%map
Deferred.both
(Sys.file_exists persistent_root_location)
(Sys.file_exists persistent_frontier_location)
with
| (`No | `Unknown), _ ->
[%log' error logger] "Persistent root directory not found at $location"
~metadata:[ ("location", `String persistent_root_location) ] ;
Error "Persistent root not found - nothing to fix against"
| _, (`No | `Unknown) ->
[%log' info logger]
"Persistent frontier directory not found - nothing to fix" ;
Ok `No_frontier
| _ ->
Ok `Both_exist

(* Apply a sequence of root transition diffs to the persistent database *)
let apply_root_transitions ~logger ~db diffs =
Expand All @@ -55,9 +52,10 @@ let apply_root_transitions ~logger ~db diffs =
.message err ) ) )
|> Result.ok_exn
in
Transition_frontier.Persistent_frontier.Database.with_batch db
~f:(fun batch ->
( List.fold diffs ~init:initial_root_hash ~f:(fun old_root_hash diff ->
let final_state_hash =
Transition_frontier.Persistent_frontier.Database.with_batch db
~f:(fun batch ->
List.fold diffs ~init:initial_root_hash ~f:(fun old_root_hash diff ->
match diff with
| Diff.Lite.E.E
(Diff.Root_transitioned
Expand All @@ -74,11 +72,13 @@ let apply_root_transitions ~logger ~db diffs =
(* Return new root hash for next iteration *)
(Root_data.Limited.Stable.Latest.hashes new_root).state_hash
| _ ->
failwith "Expected Root_transitioned diff" )
: State_hash.t )
|> ignore ) ;
failwith "Expected Root_transitioned diff" ) )
in
[%log' info logger] "Successfully applied $count diffs"
~metadata:[ ("count", `Int (List.length diffs)) ] ;
~metadata:
[ ("count", `Int (List.length diffs))
; ("final_state_hash", Frozen_ledger_hash.to_yojson final_state_hash)
] ;
Ok ()
with exn ->
[%log' error logger] "Failed to apply root transitions: $error"
Expand Down