From 34896fecb2951cfb6af9475943af509bc8931516 Mon Sep 17 00:00:00 2001
From: Andrea Cerone <andrea.cerone@trili.tech>
Date: Fri, 20 Jan 2023 17:35:15 +0000
Subject: [PATCH] Dac/Node: remove plugin prefix completely

---
 src/bin_dac_node/RPC_server.ml | 6 +-----
 src/proto_alpha/lib_dac/RPC.ml | 4 ++--
 tezt/lib_tezos/rollup.ml       | 5 ++---
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/bin_dac_node/RPC_server.ml b/src/bin_dac_node/RPC_server.ml
index 1d9bf0a26548..90c61b656b18 100644
--- a/src/bin_dac_node/RPC_server.ml
+++ b/src/bin_dac_node/RPC_server.ml
@@ -33,14 +33,10 @@ let start configuration cctxt ctxt dac_pks_opt dac_sk_uris =
         {rpc_addr; rpc_port; dac = {reveal_data_dir; threshold; _}; _} =
     configuration
   in
-  (* TODO: https://gitlab.com/tezos/tezos/-/issues/4558
-     Rename "plugin" prefix to "dac".
-  *)
-  let plugin_prefix = Tezos_rpc.Path.(open_root / "plugin") in
   let dir =
     Tezos_rpc.Directory.register_dynamic_directory
       Tezos_rpc.Directory.empty
-      plugin_prefix
+      Tezos_rpc.Path.open_root
       (fun () ->
         match Node_context.get_status ctxt with
         | Ready {dac_plugin = (module Dac_plugin); _} ->
diff --git a/src/proto_alpha/lib_dac/RPC.ml b/src/proto_alpha/lib_dac/RPC.ml
index 2fdbb3ebccfc..60b79ceb1eec 100644
--- a/src/proto_alpha/lib_dac/RPC.ml
+++ b/src/proto_alpha/lib_dac/RPC.ml
@@ -101,7 +101,7 @@ module DAC = struct
         ~query:RPC_query.empty
         ~input:store_preimage_request_encoding
         ~output:store_preimage_response_encoding
-        RPC_path.(open_root / "dac" / "store_preimage")
+        RPC_path.(open_root / "store_preimage")
 
     (* DAC/FIXME: https://gitlab.com/tezos/tezos/-/issues/4263
        remove this endpoint once end-to-end tests are in place. *)
@@ -110,7 +110,7 @@ module DAC = struct
         ~description:"Verify signature of an external message to inject in L1"
         ~query:external_message_query
         ~output:Data_encoding.bool
-        RPC_path.(open_root / "dac" / "verify_signature")
+        RPC_path.(open_root / "verify_signature")
   end
 
   let handle_serialize_dac_store_preimage cctxt dac_sk_uris reveal_data_dir
diff --git a/tezt/lib_tezos/rollup.ml b/tezt/lib_tezos/rollup.ml
index fe686f10eb68..f3b9da721bcd 100644
--- a/tezt/lib_tezos/rollup.ml
+++ b/tezt/lib_tezos/rollup.ml
@@ -891,7 +891,7 @@ module Dac = struct
              pagination_scheme)
       in
       let data : RPC_core.data = Data (JSON.unannotate preimage) in
-      make ~data PUT ["plugin"; "dac"; "store_preimage"] @@ fun json ->
+      make ~data PUT ["store_preimage"] @@ fun json ->
       JSON.
         ( json |-> "root_hash" |> as_string,
           json |-> "external_message" |> get_bytes_from_json_string_node )
@@ -903,7 +903,6 @@ module Dac = struct
             match Hex.of_string external_msg with `Hex s -> s );
         ]
       in
-      make ~query_string GET ["plugin"; "dac"; "verify_signature"]
-      @@ JSON.as_bool
+      make ~query_string GET ["verify_signature"] @@ JSON.as_bool
   end
 end
-- 
GitLab