Skip to content

Commit 0e19357

Browse files
committed
Push block_on_async_exn to top level
1 parent 3b0baac commit 0e19357

File tree

5 files changed

+19
-13
lines changed

5 files changed

+19
-13
lines changed

src/app/dump_blocks/dump_blocks.ml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,9 +82,11 @@ let output_block : type a. a -> a codec io -> unit =
8282
*)
8383
let f (type a) ?parent (outputs : a codec io list) make_breadcrumb =
8484
Async.Thread_safe.block_on_async_exn (fun () ->
85-
let frontier = create_frontier ~epoch_ledger_backing_type:Stable_db () in
86-
let root = Full_frontier.root frontier in
8785
let open Async_kernel.Deferred.Let_syntax in
86+
let%bind frontier =
87+
create_frontier ~epoch_ledger_backing_type:Stable_db ()
88+
in
89+
let root = Full_frontier.root frontier in
8890
let%map breadcrumb = make_breadcrumb root in
8991
List.iter outputs ~f:(fun output ->
9092
let module Enc = (val output.encoding) in

src/lib/mina_lmdb_storage/block.ml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,8 @@ let%test_module "Block storage tests" =
182182
Quickcheck.test (gen_breadcrumb ~verifier ()) ~trials:1
183183
~f:(fun make_breadcrumb ->
184184
let frontier =
185-
create_frontier ~epoch_ledger_backing_type:Stable_db ()
185+
Async.Thread_safe.block_on_async_exn (fun () ->
186+
create_frontier ~epoch_ledger_backing_type:Stable_db () )
186187
in
187188
let root = Full_frontier.root frontier in
188189
let reader, writer = Pipe.create () in
@@ -211,7 +212,8 @@ let%test_module "Block storage tests" =
211212
Quickcheck.test (gen_breadcrumb ~verifier ()) ~trials:4
212213
~f:(fun make_breadcrumb ->
213214
let frontier =
214-
create_frontier ~epoch_ledger_backing_type:Stable_db ()
215+
Async.Thread_safe.block_on_async_exn (fun () ->
216+
create_frontier ~epoch_ledger_backing_type:Stable_db () )
215217
in
216218
let root = Full_frontier.root frontier in
217219
let reader, writer = Pipe.create () in

src/lib/transition_frontier/full_frontier/full_frontier.ml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -987,6 +987,7 @@ module For_tests = struct
987987

988988
let create_frontier ~epoch_ledger_backing_type () =
989989
let open Core in
990+
let open Async.Deferred.Let_syntax in
990991
let epoch_ledger_location =
991992
Filename.temp_dir_name ^/ "epoch_ledger"
992993
^ (Uuid_unix.create () |> Uuid.to_string)
@@ -1025,8 +1026,9 @@ module For_tests = struct
10251026
~directory:(Filename.temp_file "snarked_ledger" "")
10261027
~ledger_depth
10271028
in
1028-
Async.Thread_safe.block_on_async_exn (fun () ->
1029-
Persistent_root.reset_to_genesis_exn persistent_root ~precomputed_values ) ;
1029+
let%map () =
1030+
Persistent_root.reset_to_genesis_exn persistent_root ~precomputed_values
1031+
in
10301032
let persistent_root_instance =
10311033
Persistent_root.create_instance_exn persistent_root
10321034
in

src/lib/transition_frontier/full_frontier/full_frontier.mli

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ module For_tests : sig
8989
val create_frontier :
9090
epoch_ledger_backing_type:Mina_ledger.Ledger.Root.Config.backing_type
9191
-> unit
92-
-> t
92+
-> t Async_kernel.Deferred.t
9393

9494
val clean_up_persistent_root : frontier:t -> unit
9595

src/lib/transition_frontier/tests/full_frontier_tests.ml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let%test_module "Full_frontier tests" =
3434
Quickcheck.test (gen_breadcrumb ~verifier ()) ~trials:4
3535
~f:(fun make_breadcrumb ->
3636
Async.Thread_safe.block_on_async_exn (fun () ->
37-
let frontier =
37+
let%bind frontier =
3838
create_frontier ~epoch_ledger_backing_type:Stable_db ()
3939
in
4040
let root = Full_frontier.root frontier in
@@ -58,7 +58,7 @@ let%test_module "Full_frontier tests" =
5858
Quickcheck.test gen_branches ~trials:4
5959
~f:(fun (make_short_branch, make_long_branch) ->
6060
Async.Thread_safe.block_on_async_exn (fun () ->
61-
let frontier =
61+
let%bind frontier =
6262
create_frontier ~epoch_ledger_backing_type:Stable_db ()
6363
in
6464
let test_best_tip ?message breadcrumb =
@@ -93,7 +93,7 @@ let%test_module "Full_frontier tests" =
9393
~trials:4
9494
~f:(fun make_seq ->
9595
Async.Thread_safe.block_on_async_exn (fun () ->
96-
let frontier =
96+
let%bind frontier =
9797
create_frontier ~epoch_ledger_backing_type:Stable_db ()
9898
in
9999
let root = Full_frontier.root frontier in
@@ -123,7 +123,7 @@ let%test_module "Full_frontier tests" =
123123
~trials:2
124124
~f:(fun make_seq ->
125125
Async.Thread_safe.block_on_async_exn (fun () ->
126-
let frontier =
126+
let%bind frontier =
127127
create_frontier ~epoch_ledger_backing_type:Stable_db ()
128128
in
129129
let root = Full_frontier.root frontier in
@@ -152,7 +152,7 @@ let%test_module "Full_frontier tests" =
152152
in
153153
Quickcheck.test gen ~trials:4 ~f:(fun make_seq ->
154154
Async.Thread_safe.block_on_async_exn (fun () ->
155-
let frontier =
155+
let%bind frontier =
156156
create_frontier ~epoch_ledger_backing_type:Stable_db ()
157157
in
158158
let root = Full_frontier.root frontier in
@@ -181,7 +181,7 @@ let%test_module "Full_frontier tests" =
181181
Quickcheck.test gen ~trials:4
182182
~f:(fun (make_ancestors, make_branch_a, make_branch_b) ->
183183
Async.Thread_safe.block_on_async_exn (fun () ->
184-
let frontier =
184+
let%bind frontier =
185185
create_frontier ~epoch_ledger_backing_type:Stable_db ()
186186
in
187187
let root = Full_frontier.root frontier in

0 commit comments

Comments
 (0)