Merge pull request #17289 from MinaProtocol/dw/mina-stdlib-unix

Mina_stdlib_unix: introduce and move file_system, exit_handlers and rfc3339_time

Author: dannywillems

src/app/cli/src/cli_entrypoint/dune

@@ -59,7 +59,7 @@
   mina_compile_config
   node_error_service
   mina_stdlib
-  file_system
+  mina_stdlib_unix
   mina_version
   mina_net2
   block_time

src/app/cli/src/cli_entrypoint/mina_cli_entrypoint.ml

@@ -585,7 +585,7 @@ let setup_daemon logger ~itn_features ~default_snark_worker_fee =
     O1trace.thread "mina" (fun () ->
         let open Deferred.Let_syntax in
         let conf_dir = Mina_lib.Conf_dir.compute_conf_dir conf_dir in
-        let%bind () = File_system.create_dir conf_dir in
+        let%bind () = Mina_stdlib_unix.File_system.create_dir conf_dir in
         let () =
           if is_background then (
             Core.printf "Starting background mina daemon. (Log Dir: %s)\n%!"
@@ -687,7 +687,7 @@ let setup_daemon logger ~itn_features ~default_snark_worker_fee =
           let make_version () =
             let%map () =
               (*Delete any trace files if version changes. TODO: Implement rotate logic similar to log files*)
-              File_system.remove_dir (conf_dir ^/ "trace")
+              Mina_stdlib_unix.File_system.remove_dir (conf_dir ^/ "trace")
             in
             Yojson.Safe.to_file version_filename (`Assoc version_metadata)
           in

src/app/cli/src/init/client.ml

@@ -1643,7 +1643,8 @@ let generate_libp2p_keypair_do privkey_path =
     (* FIXME: I'd like to accumulate messages into this logger and only dump them out in failure paths. *)
     let logger = Logger.null () in
     (* Using the helper only for keypair generation requires no state. *)
-    File_system.with_temp_dir "mina-generate-libp2p-keypair" ~f:(fun tmpd ->
+    Mina_stdlib_unix.File_system.with_temp_dir "mina-generate-libp2p-keypair"
+      ~f:(fun tmpd ->
         match%bind
           Mina_net2.create ~logger ~conf_dir:tmpd ~all_peers_seen_metric:false
             ~pids:(Child_processes.Termination.create_pid_table ())
@@ -1675,7 +1676,8 @@ let dump_libp2p_keypair_do privkey_path =
     (let open Deferred.Let_syntax in
     let logger = Logger.null () in
     (* Using the helper only for keypair generation requires no state. *)
-    File_system.with_temp_dir "mina-dump-libp2p-keypair" ~f:(fun tmpd ->
+    Mina_stdlib_unix.File_system.with_temp_dir "mina-dump-libp2p-keypair"
+      ~f:(fun tmpd ->
         match%bind
           Mina_net2.create ~logger ~conf_dir:tmpd ~all_peers_seen_metric:false
             ~pids:(Child_processes.Termination.create_pid_table ())

src/app/cli/src/init/dune

@@ -40,6 +40,7 @@
   base_quickcheck
   ;;local libraries
   mina_stdlib
+  mina_stdlib_unix
   snark_profiler_lib
   archive_lib
   mina_wire_types
@@ -91,7 +92,6 @@
   transaction_snark_tests
   transaction_protocol_state
   test_util
-  file_system
   daemon_rpcs
   trust_system
   secrets

src/app/cli/src/init/mina_tracing.ml

@@ -4,7 +4,7 @@ open Async
 (** [start dir] starts writing the trace output to [dir ^/ "trace" ^/(current_pid ^ ".trace")]. *)
 let start dir =
   let trace_dir = dir ^/ "trace" in
-  let%bind () = File_system.create_dir trace_dir in
+  let%bind () = Mina_stdlib_unix.File_system.create_dir trace_dir in
   Writer.open_file ~append:true
     (trace_dir ^/ sprintf "%d.trace" (Unix.getpid () |> Pid.to_int))
   >>| O1trace_webkit_event.start_tracing

src/app/heap_usage/heap_usage.ml

@@ -58,5 +58,5 @@ let () =
       (async ~summary:"Print heap usage of selected Mina data structures"
          (let%map.Command () = Let_syntax.return () in
           fun () ->
-            File_system.with_temp_dir "mina-heap-usage"
+            Mina_stdlib_unix.File_system.with_temp_dir "mina-heap-usage"
               ~f:(main ~genesis_constants ~constraint_constants) ) ))

src/app/test_executive/dune

@@ -22,7 +22,6 @@
   cache_dir
   currency
   data_hash_lib
-  file_system
   genesis_constants
   integers
   integration_test_lib
@@ -39,8 +38,8 @@
   mina_runtime_config
   mina_signature_kind
   mina_stdlib
+  mina_stdlib_unix
   mina_transaction
-  mina_wire_types
   network_pool
   participating_state
   pickles

src/dune-project

@@ -34,11 +34,9 @@
 (package (name downloader))
 (package (name dummy_values))
 (package (name error_json))
-(package (name exit_handlers))
 (package (name extract_blocks))
 (package (name fake_network))
 (package (name fields_derivers))
-(package (name file_system))
 (package (name filtered_external_transition))
 (package (name generated_graphql_queries))
 (package (name generate_keypair))
@@ -114,6 +112,7 @@
 (package (name mina_snark_worker))
 (package (name mina_state))
 (package (name mina_stdlib))
+(package (name mina_stdlib_unix))
 (package (name mina_test_executive))
 (package (name mina_transaction_logic))
 (package (name mina_transaction))
@@ -160,7 +159,6 @@
 (package (name random_oracle_input))
 (package (name random_oracle))
 (package (name replayer))
-(package (name rfc3339_time))
 (package (name rocksdb))
 (package (name rosetta_coding))
 (package (name rosetta_lib))

src/lib/child_processes/child_processes.ml

@@ -348,7 +348,7 @@ let%test_module _ =
 
     let async_with_temp_dir f =
       Async.Thread_safe.block_on_async_exn (fun () ->
-          File_system.with_temp_dir
+          Mina_stdlib_unix.File_system.with_temp_dir
             (Filename.temp_dir_name ^/ "child-processes")
             ~f )
 

src/lib/child_processes/dune

@@ -37,6 +37,6 @@
   sexplib0
   ;; local libraries
   error_json
-  file_system
+  mina_stdlib_unix
   logger
   pipe_lib))