From 36da4a9d9c96493c9fa742014bd06313aadc679d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20El=20Siba=C3=AFe?= Date: Wed, 14 Jun 2023 14:48:05 +0200 Subject: [PATCH] octez-rpc-directory: more process parameters - more parameters from the node are needed to call `Store.init` --- src/lib_rpc_process/parameters.ml | 44 ++++++++++++++++++++--- src/lib_rpc_process/parameters.mli | 3 ++ src/lib_rpc_process/rpc_process_worker.ml | 3 ++ 3 files changed, 45 insertions(+), 5 deletions(-) diff --git a/src/lib_rpc_process/parameters.ml b/src/lib_rpc_process/parameters.ml index aeef0b5b25c6..87da4e5d3e12 100644 --- a/src/lib_rpc_process/parameters.ml +++ b/src/lib_rpc_process/parameters.ml @@ -27,18 +27,52 @@ type t = { config : Config_file.t; rpc_comm_socket_path : string; internal_events : Tezos_base.Internal_event_config.t; + genesis : Genesis.t; + history_mode : Tezos_shell_services.History_mode.t option; + data_dir : string; node_version : Tezos_version.Octez_node_version.t; } let parameters_encoding = let open Data_encoding in conv - (fun {config; rpc_comm_socket_path; internal_events; node_version} -> - (config, rpc_comm_socket_path, internal_events, node_version)) - (fun (config, rpc_comm_socket_path, internal_events, node_version) -> - {config; rpc_comm_socket_path; internal_events; node_version}) - (obj4 + (fun { + config; + rpc_comm_socket_path; + internal_events; + genesis; + history_mode; + data_dir; + node_version; + } -> + ( config, + rpc_comm_socket_path, + internal_events, + genesis, + history_mode, + data_dir, + node_version )) + (fun ( config, + rpc_comm_socket_path, + internal_events, + genesis, + history_mode, + data_dir, + node_version ) -> + { + config; + rpc_comm_socket_path; + internal_events; + genesis; + history_mode; + data_dir; + node_version; + }) + (obj7 (req "config" Config_file.encoding) (req "rpc_comm_socket_path" Data_encoding.string) (req "internal_events" Tezos_base.Internal_event_config.encoding) + (req "genesis" Genesis.encoding) + (opt "history_mode" Tezos_shell_services.History_mode.encoding) + (req "data_dir" Data_encoding.string) (req "node_version" Tezos_version.Octez_node_version.encoding)) diff --git a/src/lib_rpc_process/parameters.mli b/src/lib_rpc_process/parameters.mli index 2ed84390f8ba..a8738bd5487f 100644 --- a/src/lib_rpc_process/parameters.mli +++ b/src/lib_rpc_process/parameters.mli @@ -28,6 +28,9 @@ type t = { config : Config_file.t; rpc_comm_socket_path : string; internal_events : Tezos_base.Internal_event_config.t; + genesis : Genesis.t; + history_mode : Tezos_shell_services.History_mode.t option; + data_dir : string; node_version : Tezos_version.Octez_node_version.t; } diff --git a/src/lib_rpc_process/rpc_process_worker.ml b/src/lib_rpc_process/rpc_process_worker.ml index 89389e604936..fd0114e0a306 100644 --- a/src/lib_rpc_process/rpc_process_worker.ml +++ b/src/lib_rpc_process/rpc_process_worker.ml @@ -130,6 +130,9 @@ let create ~comm_socket_path (config : Config_file.t) node_version events_config config; rpc_comm_socket_path = comm_socket_path; node_version; + genesis = config.blockchain_network.genesis; + history_mode = config.shell.history_mode; + data_dir = config.data_dir; }; } -- GitLab