From 3c7c4d0159709337fa7f76d47b534f20b1d8dcd1 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Tue, 10 Sep 2024 09:15:12 +0200 Subject: [PATCH] EVM Node: Hide `private_rpc` in `GET /configuration` It is private after all. --- etherlink/CHANGES_NODE.md | 4 ++++ etherlink/bin_node/lib_dev/services.ml | 1 + etherlink/tezt/tests/evm_sequencer.ml | 17 +---------------- .../Alpha- Configuration RPC.out | 9 --------- 4 files changed, 6 insertions(+), 25 deletions(-) diff --git a/etherlink/CHANGES_NODE.md b/etherlink/CHANGES_NODE.md index 3b55a583924a..b61f88e5cb9d 100644 --- a/etherlink/CHANGES_NODE.md +++ b/etherlink/CHANGES_NODE.md @@ -12,6 +12,10 @@ ### Bug fixes +#### RPCs + +- Hide `private_rpc` in the output of `GET /configuration`. (!14868) + #### Metrics - Fix `octez_evm_node_head` for the RPC mode. (!14849) diff --git a/etherlink/bin_node/lib_dev/services.ml b/etherlink/bin_node/lib_dev/services.ml index 619e168be6a7..8860f93e1e62 100644 --- a/etherlink/bin_node/lib_dev/services.ml +++ b/etherlink/bin_node/lib_dev/services.ml @@ -117,6 +117,7 @@ let configuration config dir = threshold_encryption_sequencer = None; proxy; observer; + private_rpc = None; } in diff --git a/etherlink/tezt/tests/evm_sequencer.ml b/etherlink/tezt/tests/evm_sequencer.ml index aac6a619f576..63402325dab7 100644 --- a/etherlink/tezt/tests/evm_sequencer.ml +++ b/etherlink/tezt/tests/evm_sequencer.ml @@ -6208,24 +6208,9 @@ let test_configuration_service = json) json in - let remove_private_rpc_port json = - JSON.update - "private_rpc" - (fun json -> - JSON.update - "port" - (fun _ -> - JSON.annotate - ~origin:"remove_fresh_ports" - (`String "hidden-for-regression-only")) - json) - json - in Regression.capture (JSON.encode (remove_public_rpc_port proxy_config)) ; - Regression.capture - (JSON.encode - (remove_public_rpc_port @@ remove_private_rpc_port @@ sequencer_config)) ; + Regression.capture (JSON.encode (remove_public_rpc_port @@ sequencer_config)) ; Regression.capture (JSON.encode (remove_public_rpc_port @@ observer_config)) ; unit diff --git a/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Configuration RPC.out b/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Configuration RPC.out index f510d7b24ddb..869e5a1f41ee 100644 --- a/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Configuration RPC.out +++ b/etherlink/tezt/tests/expected/evm_sequencer.ml/Alpha- Configuration RPC.out @@ -77,15 +77,6 @@ "batch_limit": "unlimited", "restricted_rpcs": "unrestricted", "max_active_connections": "unlimited" - }, - "private_rpc": { - "port": "hidden-for-regression-only", - "addr": "127.0.0.1", - "cors_origins": [], - "cors_headers": [], - "batch_limit": "unlimited", - "restricted_rpcs": "unrestricted", - "max_active_connections": "unlimited" } } { -- GitLab