Proto: avoid conflict between client errors

src/proto_alpha/lib_client/michelson_v1_macros.ml

@@ -1092,6 +1092,7 @@ let rec unexpand_rec expr =
 
 let () =
   let open Data_encoding in
+  let open Proto_alpha in
   register_error_kind
     `Permanent
     ~id:"michelson.macros.unexpected_annotation"

src/proto_alpha/lib_client/proto_alpha.ml

@@ -66,3 +66,12 @@ class wrap_full (t : Client_context.full) : full = object
       (t :> RPC_context.t)
       Shell_services.Blocks.path
 end
+
+let register_error_kind
+    category ~id ~title ~description ?pp
+    encoding from_error to_error =
+  let id = "client." ^ Name.name ^ "." ^ id in
+  register_error_kind
+    category ~id ~title ~description ?pp
+    encoding from_error to_error
+

src/proto_alpha/lib_protocol/test/helpers/proto_alpha.ml

@@ -37,3 +37,11 @@ end
 include Proto
 
 module M = Alpha_environment.Lift(Main)
+
+let register_error_kind
+    category ~id ~title ~description ?pp
+    encoding from_error to_error =
+  let id = "client." ^ Name.name ^ "." ^ id in
+  register_error_kind
+    category ~id ~title ~description ?pp
+    encoding from_error to_error