Skip to content

Commit f83a28a

Browse files
committed
push sig kind out of persistent frontier
1 parent 87966c4 commit f83a28a

File tree

3 files changed

+15
-5
lines changed

3 files changed

+15
-5
lines changed

src/lib/transition_frontier/persistent_frontier/persistent_frontier.ml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@ exception Invalid_genesis_state_hash of Mina_block.Validated.t
2222

2323
let construct_staged_ledger_at_root ~proof_cache_db
2424
~(precomputed_values : Precomputed_values.t) ~root_ledger ~root_transition
25-
~(root : Root_data.Minimal.Stable.Latest.t) ~protocol_states ~logger =
25+
~(root : Root_data.Minimal.Stable.Latest.t) ~protocol_states ~logger
26+
~signature_kind =
2627
let open Deferred.Or_error.Let_syntax in
2728
let blockchain_state =
2829
root_transition |> Mina_block.Validated.forget |> With_hash.data
@@ -68,7 +69,7 @@ let construct_staged_ledger_at_root ~proof_cache_db
6869
~constraint_constants:precomputed_values.constraint_constants ~logger
6970
~pending_coinbases
7071
~expected_merkle_root:(Staged_ledger_hash.ledger_hash staged_ledger_hash)
71-
~get_state ~signature_kind:Mina_signature_kind.t_DEPRECATED
72+
~get_state ~signature_kind
7273
in
7374
let constructed_staged_ledger_hash = Staged_ledger.hash staged_ledger in
7475
if
@@ -96,6 +97,7 @@ and Factory_type : sig
9697
; directory : string
9798
; verifier : Verifier.t
9899
; time_controller : Block_time.Controller.t
100+
; signature_kind : Mina_signature_kind.t
99101
; mutable instance : Instance_type.t option
100102
}
101103
end =
@@ -244,7 +246,7 @@ module Instance = struct
244246
match%map
245247
construct_staged_ledger_at_root ~proof_cache_db ~precomputed_values
246248
~root_ledger ~root_transition ~root ~protocol_states
247-
~logger:t.factory.logger
249+
~signature_kind:t.factory.signature_kind ~logger:t.factory.logger
248250
with
249251
| Error err ->
250252
Error (`Failure (Error.to_string_hum err))
@@ -356,8 +358,14 @@ end
356358

357359
type t = Factory_type.t
358360

359-
let create ~logger ~verifier ~time_controller ~directory =
360-
{ logger; verifier; time_controller; directory; instance = None }
361+
let create ~logger ~verifier ~time_controller ~directory ~signature_kind =
362+
{ logger
363+
; verifier
364+
; time_controller
365+
; directory
366+
; signature_kind
367+
; instance = None
368+
}
361369

362370
let destroy_database_exn t =
363371
assert (Option.is_none t.instance) ;

src/lib/transition_frontier/transition_frontier.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -659,6 +659,7 @@ module For_tests = struct
659659
Persistent_frontier.create ~logger ~verifier
660660
~time_controller:(Block_time.Controller.basic ~logger)
661661
~directory:frontier_dir
662+
~signature_kind:Mina_signature_kind.t_DEPRECATED
662663
in
663664
Gc.Expert.add_finalizer_exn persistent_root clean_temp_dirs ;
664665
Gc.Expert.add_finalizer_exn persistent_frontier (fun x ->

src/lib/transition_router/transition_router.ml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -613,6 +613,7 @@ let run ?(sync_local_state = true) ?(cache_exceptions = false)
613613
let persistent_frontier =
614614
Transition_frontier.Persistent_frontier.create ~logger ~verifier
615615
~time_controller ~directory:persistent_frontier_location
616+
~signature_kind:Mina_signature_kind.t_DEPRECATED
616617
in
617618
let persistent_root =
618619
Transition_frontier.Persistent_root.create ~logger

0 commit comments

Comments
 (0)