From dc0b69ea700da6eee2a24d738c6aad872f50b292 Mon Sep 17 00:00:00 2001 From: Vivien Date: Tue, 21 Feb 2023 16:17:15 +0100 Subject: [PATCH 1/2] node_config: replace literal values in dfts --- src/lib_node_config/config_file.ml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib_node_config/config_file.ml b/src/lib_node_config/config_file.ml index 33e27e28286d..6868e01485af 100644 --- a/src/lib_node_config/config_file.ml +++ b/src/lib_node_config/config_file.ml @@ -567,7 +567,7 @@ let p2p = or provided with '--peer' option. Moreover, these peers will keep \ the identity and the address of the private node secret." bool - false) + default_p2p.private_mode) (dft "limits" ~description:"Network limits" @@ -581,7 +581,7 @@ let p2p = [false]. It can be used to decrease the memory and computation \ footprints of the node." bool - false) + default_p2p.disable_mempool) (dft "enable_testchain" ~description: @@ -591,7 +591,7 @@ let p2p = computation by dropping the validation of the test network \ blocks." bool - false) + default_p2p.enable_testchain) (let open Tezos_p2p_services.Point_reconnection_config in dft "greylisting_config" -- GitLab From d935d1bad9ece71c72a9c7d584d89f98f7411e5a Mon Sep 17 00:00:00 2001 From: Vivien Date: Tue, 21 Feb 2023 16:42:20 +0100 Subject: [PATCH 2/2] node_config: factorize default params of fun update --- src/lib_node_config/config_file.ml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/lib_node_config/config_file.ml b/src/lib_node_config/config_file.ml index 6868e01485af..1e3c75547cea 100644 --- a/src/lib_node_config/config_file.ml +++ b/src/lib_node_config/config_file.ml @@ -876,13 +876,16 @@ let update ?(disable_config_validation = false) ?data_dir ?min_connections ?binary_chunks_size ?peer_table_size ?expected_pow ?bootstrap_peers ?listen_addr ?advertised_net_port ?discovery_addr ?(rpc_listen_addrs = []) ?(allow_all_rpc = []) ?(media_type = Media_type.Command_line.Any) - ?(metrics_addr = []) ?operation_metadata_size_limit ?(private_mode = false) - ?(disable_p2p_maintenance = false) ?(disable_mempool = false) + ?(metrics_addr = []) ?operation_metadata_size_limit + ?(private_mode = default_p2p.private_mode) + ?(disable_p2p_maintenance = + Option.is_none default_p2p.limits.maintenance_idle_time) + ?(disable_mempool = default_p2p.disable_mempool) ?(disable_mempool_precheck = Shell_limits.default_limits.prevalidator_limits.disable_precheck) - ?(enable_testchain = false) ?(cors_origins = []) ?(cors_headers = []) - ?rpc_tls ?log_output ?synchronisation_threshold ?history_mode ?network - ?latency cfg = + ?(enable_testchain = default_p2p.enable_testchain) ?(cors_origins = []) + ?(cors_headers = []) ?rpc_tls ?log_output ?synchronisation_threshold + ?history_mode ?network ?latency cfg = let open Lwt_result_syntax in let disable_config_validation = cfg.disable_config_validation || disable_config_validation -- GitLab