From 2178c43def9ddd0aa7a9631a8bd8ade190646fa5 Mon Sep 17 00:00:00 2001
From: phink <paul.laforgue@nomadic-labs.com>
Date: Wed, 17 Jul 2024 17:20:21 +0200
Subject: [PATCH] Tezt/Dal_node: remove Client dependency in dal_node.ml

---
 src/lib_octogram/tezos.ml   | 8 +++++++-
 tezt/lib_tezos/dal_node.ml  | 9 +++------
 tezt/lib_tezos/dal_node.mli | 2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/lib_octogram/tezos.ml b/src/lib_octogram/tezos.ml
index 060c415acfb0..78c6d302cefa 100644
--- a/src/lib_octogram/tezos.ml
+++ b/src/lib_octogram/tezos.ml
@@ -212,6 +212,12 @@ let octez_endpoint state endpoint =
       Client.Node (Agent_state.find (Octez_node_k node) state)
   | Remote {endpoint} -> Foreign_endpoint (parse_endpoint endpoint)
 
+let octez_foreign_endpoint state endpoint =
+  match endpoint with
+  | Uri.Owned {name = node} ->
+      Node.as_rpc_endpoint (Agent_state.find (Octez_node_k node) state)
+  | Remote {endpoint} -> parse_endpoint endpoint
+
 let dal_foreign_endpoint state endpoint =
   match endpoint with
   | Uri.Owned {name = node} ->
@@ -2860,7 +2866,7 @@ module Start_octez_dal_node = struct
         ~rpc_port
         ~listen_addr:(mk_addr net_port)
         ~metrics_addr:(mk_addr metrics_port)
-        ~l1_node_endpoint:(octez_endpoint state l1_node_uri)
+        ~l1_node_endpoint:(octez_foreign_endpoint state l1_node_uri)
         ()
     in
     (* TODO: https://gitlab.com/tezos/tezos/-/issues/6283
diff --git a/tezt/lib_tezos/dal_node.ml b/tezt/lib_tezos/dal_node.ml
index 2d28b43313a8..0f995810f94b 100644
--- a/tezt/lib_tezos/dal_node.ml
+++ b/tezt/lib_tezos/dal_node.ml
@@ -32,7 +32,7 @@ module Parameters = struct
         (** The TCP address and port at which this instance can be reached. *)
     public_addr : string option;
     metrics_addr : string;
-    l1_node_endpoint : Client.endpoint;
+    l1_node_endpoint : Endpoint.t;
     mutable pending_ready : unit option Lwt.u list;
     runner : Runner.t option;
   }
@@ -296,13 +296,10 @@ let create ?runner ?(path = Uses.path Constant.octez_dal_node) ?name ?color
     ?listen_addr
     ?public_addr
     ?metrics_addr
-    ~l1_node_endpoint:(Client.Node node)
+    ~l1_node_endpoint:(Node.as_rpc_endpoint node)
     ()
 
 let make_arguments node =
-  let l1_endpoint =
-    Client.as_foreign_endpoint node.persistent_state.l1_node_endpoint
-  in
   let rpc_host =
     match node.persistent_state.runner with
     | Some _ -> Unix.(string_of_inet_addr inet_addr_any)
@@ -310,7 +307,7 @@ let make_arguments node =
   in
   [
     "--endpoint";
-    Endpoint.as_string l1_endpoint;
+    Endpoint.as_string node.persistent_state.l1_node_endpoint;
     "--rpc-addr";
     Format.asprintf "%s:%d" rpc_host (rpc_port node);
     "--net-addr";
diff --git a/tezt/lib_tezos/dal_node.mli b/tezt/lib_tezos/dal_node.mli
index 2b4bf0a8e54b..c80ed2e98a9c 100644
--- a/tezt/lib_tezos/dal_node.mli
+++ b/tezt/lib_tezos/dal_node.mli
@@ -64,7 +64,7 @@ val create_from_endpoint :
   ?listen_addr:string ->
   ?public_addr:string ->
   ?metrics_addr:string ->
-  l1_node_endpoint:Client.endpoint ->
+  l1_node_endpoint:Endpoint.t ->
   unit ->
   t
 
-- 
GitLab