Fixing issue with archive_blocks module which were imported when using Precomputed enu

Author: dkijania

src/test/mina_automation/archive_blocks.ml

@@ -19,12 +19,12 @@ let default = Executor.default
 
 type format = Precomputed | Extensional
 
-let path =
+let path () =
   Deferred.map Executor.PathFinder.standalone_path ~f:(fun opt ->
       Option.value_exn opt
         ~message:
-          "Could not find standalone path. App is not executable outside the \
-           dune" )
+          "Could not find standalone path for archive blocks. App is not \
+           executable outside the dune" )
 
 let format_to_string format =
   match format with

src/test/mina_automation/missing_blocks_auditor.ml

@@ -13,9 +13,9 @@ end
 
 module PathFinder = Executor.Make_PathFinder (Paths)
 
-let path =
+let path () =
   Deferred.map PathFinder.standalone_path ~f:(fun opt ->
       Option.value_exn opt
         ~message:
-          "Could not find standalone path. App is not executable outside the \
-           dune" )
+          "Could not find standalone path for missing block auditor. App is \
+           not executable outside the dune" )

src/test/mina_automation/missing_blocks_guardian.ml

@@ -14,7 +14,7 @@ module Config = struct
     ; run_mode : mode
     ; missing_blocks_auditor : string
     ; archive_blocks : string
-    ; block_format : Archive_blocks.format
+    ; block_format : [ `Precomputed | `Extensional ]
     }
 
   let to_args t =
@@ -34,7 +34,7 @@ module Config = struct
       ; ("DB_PORT", Int.to_string (Option.value_exn (Uri.port t.archive_uri)))
       ; ("DB_NAME", path_no_leading_slash)
       ; ("PGPASSWORD", Option.value_exn (Uri.password t.archive_uri))
-      ; ("BLOCKS_FORMAT", Archive_blocks.format_to_string t.block_format)
+      ; ("BLOCKS_FORMAT", (match t.block_format with `Precomputed -> "precomputed" | `Extensional -> "extensional"))
       ; ("MISSING_BLOCKS_AUDITOR", t.missing_blocks_auditor)
       ; ("ARCHIVE_BLOCKS", t.archive_blocks)
       ]

src/test/mina_automation/runner/runner.ml

@@ -3,38 +3,32 @@ open Core
 open Mina_automation_fixture
 
 let run (module F : Intf.Fixture) =
-  let open Deferred.Let_syntax in
   let%bind test_case_after_setup =
-    match%bind.Deferred F.setup () with
+    match%bind F.setup () with
     | Ok t ->
         return t
     | Error err ->
         failwithf "Setup failed with error: %s" (Error.to_string_hum err) ()
   in
   Monitor.protect
     ~finally:(fun () ->
-      match%bind F.teardown test_case_after_setup with
+      match%map F.teardown test_case_after_setup with
       | Ok () ->
-          Deferred.unit
+          ()
       | Error err ->
-          eprintf "Teardown failed with error: %s\n" (Error.to_string_hum err) ;
-          Deferred.unit )
+          eprintf "Teardown failed with error: %s\n" (Error.to_string_hum err)
+      )
     (fun () ->
-      match%bind.Deferred F.test_case test_case_after_setup with
+      match%bind F.test_case test_case_after_setup with
       | Ok result ->
           return result
       | Error err ->
-          let%map _ = F.on_test_fail test_case_after_setup in
+          let%map () = F.on_test_fail test_case_after_setup in
           Intf.Failed (Error.to_string_hum err) )
 
 let run_blocking test_case () =
-  let (result : Intf.test_result) =
-    Async.Thread_safe.block_on_async_exn (fun () -> run test_case)
-  in
-  match result with
+  match Async.Thread_safe.block_on_async_exn (fun () -> run test_case) with
   | Intf.Passed ->
       ()
-  | Intf.Warning msg ->
-      Alcotest.fail msg
-  | Intf.Failed msg ->
+  | Warning msg | Failed msg ->
       Alcotest.fail msg