refactor out some of common methods for future usage of upgrade archive test

Author: dkijania

src/test/archive/archive_node_tests/common.ml

@@ -0,0 +1,41 @@
+open Async
+open Core
+open Mina_automation
+
+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
+      "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 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
+  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
+
+let unpack_precomputed_blocks ~temp_dir source =
+  let open Deferred.Let_syntax in
+  let%bind precomputed_blocks =
+    Network_data.untar_precomputed_blocks source temp_dir
+  in
+  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/mina_automation/archive.ml

@@ -35,6 +35,28 @@ module Paths = struct
   let official_name = "mina-archive"
 end
 
+module Scripts = struct
+  type t = [ `CreateSchema | `DropTables | `Upgrade | `Rollback ]
+
+  let possible_locations = [ "/etc/mina/archive"; "src/app/archive" ]
+
+  let file t =
+    match t with
+    | `CreateSchema ->
+        "create_schema.sql"
+    | `DropTables ->
+        "drop_tables.sql"
+    | `Upgrade ->
+        "upgrade-to-mesa.sql"
+    | `Rollback ->
+        "rollback_to-berkeley.sql"
+
+  let filepath t =
+    let file = file t in
+    let possible_locations = [ "/etc/mina/archive"; "src/app/archive" ] in
+    Utils.possible_locations ~file possible_locations
+end
+
 module Executor = Executor.Make (Paths)
 
 type t = { config : Config.t; executor : Executor.t }

src/test/mina_automation/archive_blocks.ml

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

src/test/mina_automation/executor.ml

@@ -33,9 +33,6 @@ let logger = Logger.create ()
 module Make_PathFinder (P : AppPaths) = struct
   module Paths = P
 
-  let paths =
-    Option.value_map ~f:(String.split ~on:':') ~default:[] (Sys.getenv "PATH")
-
   let built_name = Printf.sprintf "_build/default/%s" P.dune_name
 
   let exists_at_path path prefix =
@@ -51,7 +48,7 @@ module Make_PathFinder (P : AppPaths) = struct
         Deferred.return (Some built_name)
     | _ -> (
         match%bind
-          Deferred.List.find_map ~f:(exists_at_path P.official_name) paths
+          Deferred.List.find_map ~f:(exists_at_path P.official_name) Utils.paths
         with
         | Some _ ->
             Deferred.return (Some P.official_name)
@@ -133,7 +130,7 @@ module Make (P : AppPaths) = struct
             match%bind
               Deferred.List.find_map
                 ~f:(PathFinder.exists_at_path PathFinder.Paths.official_name)
-                PathFinder.paths
+                Utils.paths
             with
             | Some prefix ->
                 f_debian ~args ~prefix ?env ()

src/test/mina_automation/missing_blocks_auditor.ml

@@ -17,5 +17,5 @@ let path () =
   Deferred.map PathFinder.standalone_path ~f:(fun opt ->
       Option.value_exn opt
         ~message:
-          "Could not find standalone path for missing block auditor. App is \
-           not executable outside the dune" )
+          "Could not find standalone for missing block auditor. Missing block \
+           auditor is not executable outside the dune" )

src/test/mina_automation/psql.ml

@@ -82,9 +82,10 @@ let run_command ~connection command =
   @return A deferred string containing the output of the command.
 *)
 
-let run_script ~connection ~db script =
+let run_script ~connection ?db script =
+  let maybe_db = Option.value_map db ~default:[] ~f:(fun db -> [ "-d"; db ]) in
   let creds = create_credential_arg ~connection in
-  Util.run_cmd_exn "." psql (creds @ [ "-d"; db; "-a"; "-f"; script ])
+  Util.run_cmd_exn "." psql (creds @ maybe_db @ [ "-a"; "-f"; script ])
 
 let create_empty_db ~connection ~db =
   run_command ~connection (sprintf "CREATE DATABASE %s;" db)

src/test/mina_automation/utils.ml

@@ -1,6 +1,21 @@
 open Integration_test_lib
 open Async
-open Core_kernel
+open Core
+
+let paths =
+  Option.value_map ~f:(String.split ~on:':') ~default:[] (Sys.getenv "PATH")
+
+let possible_locations ~file possible_locations =
+  let exists_at_path folder file =
+    match Sys.file_exists (folder ^ "/" ^ file) with
+    | `Yes ->
+        Some (folder ^ "/" ^ file)
+    | _ ->
+        None
+  in
+
+  possible_locations @ paths
+  |> List.find_map ~f:(fun folder -> exists_at_path folder file)
 
 let wget ~url ~target = Util.run_cmd_exn "." "wget" [ "-c"; url; "-O"; target ]