From 06192b641cd720ff0a19891292dd9a545a9337d0 Mon Sep 17 00:00:00 2001 From: Litchi Pi Date: Fri, 29 Apr 2022 12:32:58 +0400 Subject: [PATCH 1/2] lib_proxy: Using Ptime.Span instead of int for sym_block_caching_time Signed-off-by: Litchi Pi --- src/lib_proxy/proxy_services.ml | 4 ++-- src/lib_proxy/proxy_services.mli | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib_proxy/proxy_services.ml b/src/lib_proxy/proxy_services.ml index 00e4fcdc6f9c..06f69a042390 100644 --- a/src/lib_proxy/proxy_services.ml +++ b/src/lib_proxy/proxy_services.ml @@ -118,7 +118,7 @@ type mode = | Proxy_client | Proxy_server of { sleep : float -> unit Lwt.t; - sym_block_caching_time : int option; + sym_block_caching_time : Ptime.span option; on_disk_proxy_builder : (Context_hash.t -> Proxy_delegate.t tzresult Lwt.t) option; } @@ -191,7 +191,7 @@ let schedule_clearing (printer : Tezos_client_base.Client_context.printer) let* time_between_blocks = match sym_block_caching_time with | Some sym_block_caching_time -> - Lwt.return @@ Int.to_float sym_block_caching_time + Lwt.return @@ Ptime.Span.to_float_s sym_block_caching_time | None -> ( let (module Proxy_environment) = proxy_env in let* ro = diff --git a/src/lib_proxy/proxy_services.mli b/src/lib_proxy/proxy_services.mli index 566aab94694e..6c893c59d71e 100644 --- a/src/lib_proxy/proxy_services.mli +++ b/src/lib_proxy/proxy_services.mli @@ -40,7 +40,7 @@ type mode = | Proxy_client (** [tezos-client --mode proxy] is running *) | Proxy_server of { sleep : float -> unit Lwt.t; - sym_block_caching_time : int option; + sym_block_caching_time : Ptime.span option; on_disk_proxy_builder : (Context_hash.t -> Proxy_delegate.t tzresult Lwt.t) option; } -- GitLab From 71d4363e09ebc58f01ca8369e649320fc5007952 Mon Sep 17 00:00:00 2001 From: Litchi Pi Date: Mon, 2 May 2022 12:46:09 +0400 Subject: [PATCH 2/2] wip fixup bin_proxy_server Signed-off-by: Litchi Pi --- src/bin_proxy_server/main_proxy_server.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/bin_proxy_server/main_proxy_server.ml b/src/bin_proxy_server/main_proxy_server.ml index 47b4418312ea..7bb2f8cbd199 100644 --- a/src/bin_proxy_server/main_proxy_server.ml +++ b/src/bin_proxy_server/main_proxy_server.ml @@ -32,7 +32,7 @@ let config : string option Term.t = let doc = "The configuration file. Fields (see corresponding options): endpoint \ (string), rpc_addr (string), rpc_tls (string), sym_block_caching_time \ - (int), and data_dir (string)." + (Ptime.span), and data_dir (string)." in let docv = "CONFIG" in Arg.(value & opt (some string) None & info ["c"; "config"] ~docv ~doc) @@ -70,7 +70,7 @@ let data_dir : string option Term.t = let docv = "DATA_DIR" in Arg.(value & opt (some string) None & info ["d"; "data-dir"] ~docv ~doc) -let sym_block_caching_time : int option Term.t = +let sym_block_caching_time : Ptime.span option Term.t = let doc = "The duration (in seconds) during which data for a symbolic block \ identifier (like head) is kept. Smaller values increase the endpoint's \ @@ -79,7 +79,7 @@ let sym_block_caching_time : int option Term.t = this value)." in let docv = "SYM_BLOCK_CACHING_TIME" in - Arg.(value & opt (some int) None & info ["sym-block-caching-time"] ~docv ~doc) + Arg.(value & opt (some Ptime.span conv) None & info ["sym-block-caching-time"] ~docv ~doc) let load_config_from_file (config_file : string) = let open Lwt_result_syntax in -- GitLab