From c33fbcbc02e5d6a8d21bdacbe63aefe85bf36380 Mon Sep 17 00:00:00 2001 From: Thomas Letan Date: Fri, 16 Feb 2024 09:57:38 +0100 Subject: [PATCH] EVM Node: Rename [Rollup_node_services] into [Rollup_services] This is to avoid a naming clash that is loosing Merlin (and my patience). --- etherlink/bin_node/lib_dev/blueprints_publisher.ml | 2 +- etherlink/bin_node/lib_dev/delayed_inbox.ml | 4 ++-- etherlink/bin_node/lib_dev/evm_events_follower.ml | 2 +- etherlink/bin_node/lib_dev/rollup_node.ml | 2 +- etherlink/bin_node/lib_dev/rollup_node_follower.ml | 4 ++-- .../lib_dev/{rollup_node_services.ml => rollup_services.ml} | 0 etherlink/bin_node/lib_dev/sequencer.ml | 2 +- etherlink/bin_node/lib_dev/tx_pool.ml | 2 +- etherlink/bin_node/main.ml | 5 ++--- 9 files changed, 11 insertions(+), 12 deletions(-) rename etherlink/bin_node/lib_dev/{rollup_node_services.ml => rollup_services.ml} (100%) diff --git a/etherlink/bin_node/lib_dev/blueprints_publisher.ml b/etherlink/bin_node/lib_dev/blueprints_publisher.ml index 0a698d24ade7..1ab72c4d2fad 100644 --- a/etherlink/bin_node/lib_dev/blueprints_publisher.ml +++ b/etherlink/bin_node/lib_dev/blueprints_publisher.ml @@ -95,7 +95,7 @@ module Worker = struct (* We do not check if we succeed or not: this will be done when new L2 heads come from the rollup node. *) witness_level self level ; - let* res = Rollup_node_services.publish ~rollup_node_endpoint payload in + let* res = Rollup_services.publish ~rollup_node_endpoint payload in match res with | Ok _ -> Blueprint_events.blueprint_injected level | Error _ -> diff --git a/etherlink/bin_node/lib_dev/delayed_inbox.ml b/etherlink/bin_node/lib_dev/delayed_inbox.ml index bf2f7033d05c..09bdb7f811e1 100644 --- a/etherlink/bin_node/lib_dev/delayed_inbox.ml +++ b/etherlink/bin_node/lib_dev/delayed_inbox.ml @@ -66,7 +66,7 @@ module Worker = Worker.MakeSingle (Name) (Request) (Types) type worker = Worker.infinite Worker.queue Worker.t let subkeys_from_rollup_node path level rollup_node_endpoint = - let open Rollup_node_services in + let open Rollup_services in call_service ~base:rollup_node_endpoint durable_state_subkeys @@ -75,7 +75,7 @@ let subkeys_from_rollup_node path level rollup_node_endpoint = () let read_from_rollup_node path level rollup_node_endpoint = - let open Rollup_node_services in + let open Rollup_services in call_service ~base:rollup_node_endpoint durable_state_value diff --git a/etherlink/bin_node/lib_dev/evm_events_follower.ml b/etherlink/bin_node/lib_dev/evm_events_follower.ml index f4389d2d46fa..0d48316f92c4 100644 --- a/etherlink/bin_node/lib_dev/evm_events_follower.ml +++ b/etherlink/bin_node/lib_dev/evm_events_follower.ml @@ -64,7 +64,7 @@ module Worker = Worker.MakeSingle (Name) (Request) (Types) type worker = Worker.infinite Worker.queue Worker.t let read_from_rollup_node path level rollup_node_endpoint = - let open Rollup_node_services in + let open Rollup_services in call_service ~base:rollup_node_endpoint durable_state_value diff --git a/etherlink/bin_node/lib_dev/rollup_node.ml b/etherlink/bin_node/lib_dev/rollup_node.ml index 7021540b800f..94f3247d8579 100644 --- a/etherlink/bin_node/lib_dev/rollup_node.ml +++ b/etherlink/bin_node/lib_dev/rollup_node.ml @@ -26,7 +26,7 @@ (* *) (*****************************************************************************) -open Rollup_node_services +open Rollup_services open Transaction_format module MakeBackend (Base : sig diff --git a/etherlink/bin_node/lib_dev/rollup_node_follower.ml b/etherlink/bin_node/lib_dev/rollup_node_follower.ml index 2af2bceed792..561088d96c2c 100644 --- a/etherlink/bin_node/lib_dev/rollup_node_follower.ml +++ b/etherlink/bin_node/lib_dev/rollup_node_follower.ml @@ -86,7 +86,7 @@ let worker = | Lwt.Sleep -> Error (TzTrace.make No_l2_block_follower)) let read_from_rollup_node path level rollup_node_endpoint = - let open Rollup_node_services in + let open Rollup_services in call_service ~base:rollup_node_endpoint durable_state_value @@ -144,7 +144,7 @@ let start ({rollup_node_endpoint} as parameters) = Lwt.dont_wait (fun () -> let*! stream = - Rollup_node_services.make_streamed_call ~rollup_node_endpoint + Rollup_services.make_streamed_call ~rollup_node_endpoint in process_rollup_node_stream ~stream worker) (fun _ -> ()) diff --git a/etherlink/bin_node/lib_dev/rollup_node_services.ml b/etherlink/bin_node/lib_dev/rollup_services.ml similarity index 100% rename from etherlink/bin_node/lib_dev/rollup_node_services.ml rename to etherlink/bin_node/lib_dev/rollup_services.ml diff --git a/etherlink/bin_node/lib_dev/sequencer.ml b/etherlink/bin_node/lib_dev/sequencer.ml index 7e49ea113967..2005fb4aad0b 100644 --- a/etherlink/bin_node/lib_dev/sequencer.ml +++ b/etherlink/bin_node/lib_dev/sequencer.ml @@ -210,7 +210,7 @@ let main ~data_dir ~rollup_node_endpoint ~max_blueprints_lag let open Lwt_result_syntax in let open Configuration in let* smart_rollup_address = - Rollup_node_services.smart_rollup_address rollup_node_endpoint + Rollup_services.smart_rollup_address rollup_node_endpoint in let* ctxt, loaded = Evm_context.init diff --git a/etherlink/bin_node/lib_dev/tx_pool.ml b/etherlink/bin_node/lib_dev/tx_pool.ml index 0a4e95053d61..b0c5203be6b7 100644 --- a/etherlink/bin_node/lib_dev/tx_pool.ml +++ b/etherlink/bin_node/lib_dev/tx_pool.ml @@ -473,7 +473,7 @@ let start ({mode; _} as parameters) = match mode with | Proxy {rollup_node_endpoint} -> let*! stream_l2 = - Rollup_node_services.make_streamed_call ~rollup_node_endpoint + Rollup_services.make_streamed_call ~rollup_node_endpoint in subscribe_l2_block ~stream_l2 worker | Sequencer -> Lwt.return_unit) diff --git a/etherlink/bin_node/main.ml b/etherlink/bin_node/main.ml index f9c29ed75681..68e1ea62be2e 100644 --- a/etherlink/bin_node/main.ml +++ b/etherlink/bin_node/main.ml @@ -103,8 +103,7 @@ let retry_connection (f : Uri.t -> string tzresult Lwt.t) endpoint : let*! result = f endpoint in match result with | Ok smart_rollup_address -> return smart_rollup_address - | Error err - when Evm_node_lib_dev.Rollup_node_services.is_connection_error err -> + | Error err when Evm_node_lib_dev.Rollup_services.is_connection_error err -> let*! () = emit Event.event_retrying_connect (Uri.to_string endpoint, delay) in @@ -185,7 +184,7 @@ let rollup_node_config_dev ~rollup_node_endpoint ~keep_alive = let* smart_rollup_address = fetch_smart_rollup_address ~keep_alive - Rollup_node_services.smart_rollup_address + Rollup_services.smart_rollup_address rollup_node_endpoint in return -- GitLab