From 65bf5d362774815925f8cddd32fe66b99330e904 Mon Sep 17 00:00:00 2001
From: Sylvain Ribstein <sylvain.ribstein@nomadic-labs.com>
Date: Thu, 22 Feb 2024 14:51:14 +0100
Subject: [PATCH] etherlink/tezt: add name to evm_node instance based on mode

---
 etherlink/tezt/lib/evm_node.ml  | 14 ++++++++++----
 etherlink/tezt/lib/evm_node.mli |  4 +++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/etherlink/tezt/lib/evm_node.ml b/etherlink/tezt/lib/evm_node.ml
index b7d8d81d4b08..1316faddf581 100644
--- a/etherlink/tezt/lib/evm_node.ml
+++ b/etherlink/tezt/lib/evm_node.ml
@@ -227,12 +227,18 @@ let wait_for_blueprint_applied ~timeout evm_node level =
   | Not_running | Running {session_state = {ready = false; _}; _} ->
       failwith "EVM node is not ready"
 
-let create ?runner ?(mode = Proxy {devmode = false}) ?data_dir ?rpc_addr
+let create ?name ?runner ?(mode = Proxy {devmode = false}) ?data_dir ?rpc_addr
     ?rpc_port endpoint =
   let arguments, rpc_addr, rpc_port =
     connection_arguments ?rpc_addr ?rpc_port ()
   in
-  let name = fresh_name () in
+  let new_name () =
+    match mode with
+    | Proxy _ -> "proxy_" ^ fresh_name ()
+    | Sequencer _ -> "sequencer_" ^ fresh_name ()
+    | Observer _ -> "observer_" ^ fresh_name ()
+  in
+  let name = Option.value ~default:(new_name ()) name in
   let data_dir =
     match data_dir with None -> Temp.dir name | Some dir -> dir
   in
@@ -376,9 +382,9 @@ let endpoint ?(private_ = false) (evm_node : t) =
   in
   Format.sprintf "http://%s:%d%s" addr port path
 
-let init ?runner ?mode ?data_dir ?rpc_addr ?rpc_port rollup_node =
+let init ?name ?runner ?mode ?data_dir ?rpc_addr ?rpc_port rollup_node =
   let evm_node =
-    create ?runner ?mode ?data_dir ?rpc_addr ?rpc_port rollup_node
+    create ?name ?runner ?mode ?data_dir ?rpc_addr ?rpc_port rollup_node
   in
   let* () = run evm_node in
   return evm_node
diff --git a/etherlink/tezt/lib/evm_node.mli b/etherlink/tezt/lib/evm_node.mli
index b18b47a57a01..b7716fab2c01 100644
--- a/etherlink/tezt/lib/evm_node.mli
+++ b/etherlink/tezt/lib/evm_node.mli
@@ -62,7 +62,7 @@ val mode : t -> mode
 (** Returns the name of the EVM node. *)
 val name : t -> string
 
-(** [create ?runner ?mode ?data_dir ?rpc_addr ?rpc_port
+(** [create ?name ?runner ?mode ?data_dir ?rpc_addr ?rpc_port
     rollup_node_endpoint] creates an EVM node server.
 
     The server listens to requests at address [rpc_addr] and the port
@@ -75,6 +75,7 @@ val name : t -> string
     [mode] defaults to [Proxy].
 *)
 val create :
+  ?name:string ->
   ?runner:Runner.t ->
   ?mode:mode ->
   ?data_dir:string ->
@@ -108,6 +109,7 @@ val wait_for_blueprint_injected : timeout:float -> t -> int -> unit Lwt.t
 (** [init ?runner ?mode ?data_dir ?rpc_addr ?rpc_port rollup_node_endpoint]
     creates an EVM node server with {!create} and runs it with {!run}. *)
 val init :
+  ?name:string ->
   ?runner:Runner.t ->
   ?mode:mode ->
   ?data_dir:string ->
-- 
GitLab