error out if sql commands return an error

Author: dkijania

src/test/archive/archive_node_tests/archive_node_tests.ml

@@ -12,12 +12,13 @@ open Mina_automation_fixture.Archive
 let assert_archived_blocks ~archive_uri ~expected =
   let connection = Psql.Conn_str archive_uri in
   let%bind actual_blocks_count =
-    Psql.run_command ~connection "SELECT COUNT(*) FROM blocks WHERE height > 1"
+    Psql.run_command ~connection
+      "SELECT COUNT(*) FROM blocks WHERE global_slot_since_genesis > 1"
   in
   let actual_blocks_count =
     match actual_blocks_count with
     | Ok count ->
-        count |> String.strip |> Int.of_string 
+        count |> Int.of_string
     | Error err ->
         failwith ("Failed to query blocks count: " ^ Error.to_string_hum err)
   in
@@ -54,19 +55,27 @@ module ArchivePrecomputedBlocksFromDaemon = struct
     in
     let connection = Psql.Conn_str archive_uri in
     let%bind latest_state_hash =
-      Psql.run_command_exn ~connection
+      Psql.run_command ~connection
         "SELECT state_hash FROM blocks ORDER BY id DESC LIMIT 1"
     in
+    let latest_state_hash =
+      match latest_state_hash with
+      | Ok hash ->
+          hash
+      | Error err ->
+          failwith
+            ("Failed to query latest state hash: " ^ Error.to_string_hum err)
+    in
     let output_ledger = output ^ "/output_ledger.json" in
     let replayer = Replayer.default in
-    let%bind output =
+    let%bind replayer_output =
       Replayer.run replayer ~archive_uri
         ~input_config:
           (Network_data.replayer_input_file_path test_data.network_data)
         ~target_state_hash:latest_state_hash ~interval_checkpoint:10
         ~output_ledger ()
     in
-    let () = print_endline output in
+    let () = print_endline replayer_output in
     let output_ledger = Replayer.Output.of_json_file_exn output_ledger in
     assert (
       String.equal output_ledger.target_epoch_ledgers_state_hash

src/test/mina_automation/daemon.ml

@@ -151,8 +151,8 @@ let archive_blocks t ~archive_address ~(format : Archive_blocks.format) blocks =
 let archive_blocks_from_files t ~archive_address
     ~(format : Archive_blocks.format) ?(sleep = 5) blocks =
   Deferred.List.iter blocks ~f:(fun block ->
-      Core.Unix.sleep sleep ;
-      archive_blocks t ~archive_address ~format [ block ] () >>| ignore )
+      let%bind _ = archive_blocks t ~archive_address ~format [ block ] () in
+      after (Time.Span.of_sec (Float.of_int sleep)) )
 
 let default = Executor.default
 

src/test/mina_automation/fixture/archive.ml

@@ -84,7 +84,7 @@ module Make_FixtureWithBootstrap (M : TestCaseWithBootstrap) :
     [%log info] "Tearing down archive" ;
     let%bind _ = Archive.Process.force_kill t.archive in
     let%bind.Deferred () =
-      Mina_stdlib_unix.File_system.remove_dir @@ t.network_data.folder
+      Mina_stdlib_unix.File_system.remove_dir @@ t.temp_dir
     in
     [%log info] "Archive teardown completed" ;
     Deferred.Or_error.ok_unit

src/test/mina_automation/psql.ml

@@ -68,6 +68,11 @@ let create_credential_arg ~connection =
   @ value_or_empty "-U" credentials.user
   @ value_or_empty "-d" credentials.db
 
+let run_command ~connection command =
+  let creds = create_credential_arg ~connection in
+  Util.run_cmd_or_error "." psql (creds @ [ "-c"; command; "-t" ])
+  >>| Result.map ~f:String.strip
+
 (** [run_command_exn ~connection command] runs a SQL command using psql with the given connection. 
   The command is executed in the current directory, and the output is stripped of leading and trailing whitespace.
   It raises an exception if the command fails.
@@ -76,14 +81,6 @@ let create_credential_arg ~connection =
   @param command The SQL command to execute.
   @return A deferred string containing the output of the command.
 *)
-let run_command_exn ~connection command =
-  let creds = create_credential_arg ~connection in
-  Util.run_cmd_exn "." psql (creds @ [ "-c"; command; "-t" ]) >>| String.strip
-
-let run_command ~connection command =
-  let creds = create_credential_arg ~connection in
-  Util.run_cmd_or_error "." psql (creds @ [ "-c"; command ])
-  >>| Result.map ~f:String.strip
 
 let run_script ~connection ~db script =
   let creds = create_credential_arg ~connection in