Nit(Archive Node Tests): some simplifications

Author: glyh

src/test/archive/archive_node_tests/archive_precomputed_blocks_test.ml

@@ -69,7 +69,6 @@ let perf_metrics_to_yojson metrics =
   @raises Failure if a log line cannot be parsed as valid JSON
   @raises exn if required metadata fields ("elapsed" or "label") are missing *)
 let extract_perf_metrics log_file =
-  let open Deferred.Let_syntax in
   let%bind lines = Reader.file_lines log_file in
   let perf_metrics =
     List.filter_map lines ~f:(fun line ->
@@ -122,7 +121,7 @@ let test_case (test_data : t) =
     unpack_precomputed_blocks test_data.network_data
       ~temp_dir:test_data.temp_dir
   in
-  let log_file = output ^ "/precomputed_blocks_test.log" in
+  let log_file = output ^/ "precomputed_blocks_test.log" in
   Archive.Process.start_logging test_data.archive ~log_file ;
   let%bind () =
     Daemon.archive_blocks_from_files daemon.executor
@@ -142,7 +141,7 @@ let test_case (test_data : t) =
       archive_uri test_data.temp_dir
   in
 
-  let%bind perf_data = extract_perf_metrics log_file in
+  let%map perf_data = extract_perf_metrics log_file in
   perf_metrics_to_yojson perf_data |> Yojson.to_file "archive.perf" ;
 
-  Deferred.Or_error.return Mina_automation_fixture.Intf.Passed
+  Ok Mina_automation_fixture.Intf.Passed

src/test/archive/archive_node_tests/common.ml

@@ -15,7 +15,6 @@ open Mina_automation
   @return Unit deferred that completes when assertion passes *)
 let assert_replayer_run_against_last_block ~replayer_input_file_path archive_uri
     output =
-  let open Deferred.Let_syntax in
   let connection = Psql.Conn_str archive_uri in
   let%bind latest_state_hash =
     Psql.run_command ~connection
@@ -29,18 +28,17 @@ let assert_replayer_run_against_last_block ~replayer_input_file_path archive_uri
         failwith
           ("Failed to query latest state hash: " ^ Error.to_string_hum err)
   in
-  let output_ledger = output ^ "/output_ledger.json" in
+  let output_ledger = output ^/ "output_ledger.json" in
   let replayer = Replayer.default in
-  let%bind replayer_output =
+  let%map replayer_output =
     Replayer.run replayer ~archive_uri ~input_config:replayer_input_file_path
       ~target_state_hash:latest_state_hash ~interval_checkpoint:10
       ~output_ledger ()
   in
-  let () = print_endline replayer_output in
+  print_endline replayer_output ;
   let output_ledger = Replayer.Output.of_json_file_exn output_ledger in
   assert (
-    String.equal output_ledger.target_epoch_ledgers_state_hash latest_state_hash ) ;
-  Deferred.unit
+    String.equal output_ledger.target_epoch_ledgers_state_hash latest_state_hash )
 
 (** Unpack precomputed blocks from a source archive to a temporary directory.
 
@@ -51,10 +49,8 @@ let assert_replayer_run_against_last_block ~replayer_input_file_path archive_uri
   @param source Source path of the tar archive containing precomputed blocks
   @return Deferred list of file paths to extracted JSON block files *)
 let unpack_precomputed_blocks ~temp_dir source =
-  let open Deferred.Let_syntax in
-  let%bind precomputed_blocks =
+  let%map precomputed_blocks =
     Network_data.untar_precomputed_blocks source temp_dir
   in
-  List.map precomputed_blocks ~f:(fun file -> temp_dir ^ "/" ^ file)
+  List.map precomputed_blocks ~f:(fun file -> temp_dir ^/ file)
   |> List.filter ~f:(fun file -> String.is_suffix file ~suffix:".json")
-  |> Deferred.return

src/test/archive/archive_node_tests/live_upgrade_archive.ml

@@ -20,15 +20,14 @@ open Common
 type t = Mina_automation_fixture.Archive.after_bootstrap
 
 let test_case (test_data : t) =
-  let open Deferred.Let_syntax in
   let daemon = Daemon.default () in
   let archive_uri = test_data.archive.config.postgres_uri in
   let temp_dir = test_data.temp_dir in
   let%bind precomputed_blocks =
     unpack_precomputed_blocks ~temp_dir test_data.network_data
   in
   let logger = Logger.create () in
-  let log_file = temp_dir ^ "/live_upgrade.log" in
+  let log_file = temp_dir ^/ "live_upgrade.log" in
   let upgrade_path =
     Archive.Scripts.filepath `Upgrade
     |> Option.value_exn ~message:"Failed to find upgrade script"
@@ -51,12 +50,14 @@ let test_case (test_data : t) =
       precomputed_blocks
   in
   [%log info] "Loaded all precomputed blocks" ;
+
   let%bind () = Ivar.read upgrade_script_finished in
-  let%bind () =
+
+  let%map () =
     assert_replayer_run_against_last_block
       ~replayer_input_file_path:
         (Network_data.replayer_input_file_path test_data.network_data)
       archive_uri temp_dir
   in
 
-  Deferred.Or_error.return Mina_automation_fixture.Intf.Passed
+  Ok Mina_automation_fixture.Intf.Passed

src/test/archive/archive_node_tests/load_genesis_ledger.ml

@@ -21,8 +21,8 @@ type t = Mina_automation_fixture.Archive.before_bootstrap
 
 let postgres_user_name = "postgres"
 
+(* val test_case : t -> test_result Deferred.Or_error.t *)
 let test_case (test_data : t) =
-  let open Deferred.Let_syntax in
   let config =
     { test_data.config with config_file = "genesis_ledgers/mainnet.json" }
   in
@@ -43,7 +43,7 @@ let test_case (test_data : t) =
     (Float.to_string max_postgres_memory) ;
   [%log info] "Sleep Duration: %s" (Time.Span.to_string sleep_duration) ;
 
-  let%bind result =
+  let%map result =
     let end_time = Time.add (Time.now ()) duration in
     let rec loop () =
       if Time.is_later (Time.now ()) ~than:end_time then Deferred.return ()
@@ -68,14 +68,11 @@ let test_case (test_data : t) =
         let%bind () = Clock.after sleep_duration in
         loop ()
     in
-    Monitor.try_with (fun () -> loop ())
-    >>= function
+    match%map Monitor.try_with loop with
     | Ok () ->
-        Deferred.return Mina_automation_fixture.Intf.Passed
+        Mina_automation_fixture.Intf.Passed
     | Error exn ->
         [%log error] "Test failed: %s" (Exn.to_string exn) ;
-        Deferred.return
-        @@ Mina_automation_fixture.Intf.Failed (Exn.to_string exn)
+        Failed (Exn.to_string exn)
   in
-
-  Deferred.Or_error.return result
+  Ok result

src/test/archive/archive_node_tests/upgrade_archive.ml

@@ -20,14 +20,13 @@ open Common
 type t = Mina_automation_fixture.Archive.after_bootstrap
 
 let test_case (test_data : t) =
-  let open Deferred.Let_syntax in
   let daemon = Daemon.default () in
   let archive_uri = test_data.archive.config.postgres_uri in
   let temp_dir = test_data.temp_dir in
   let%bind precomputed_blocks =
     unpack_precomputed_blocks ~temp_dir test_data.network_data
   in
-  let log_file = temp_dir ^ "/upgrade.log" in
+  let log_file = temp_dir ^/ "upgrade.log" in
   let upgrade_path =
     Archive.Scripts.filepath `Upgrade
     |> Option.value_exn ~message:"Failed to find upgrade script"
@@ -43,11 +42,11 @@ let test_case (test_data : t) =
       precomputed_blocks
   in
 
-  let%bind () =
+  let%map () =
     assert_replayer_run_against_last_block
       ~replayer_input_file_path:
         (Network_data.replayer_input_file_path test_data.network_data)
       archive_uri temp_dir
   in
 
-  Deferred.Or_error.return Mina_automation_fixture.Intf.Passed
+  Ok Mina_automation_fixture.Intf.Passed