Refactor: rename package tezos-embedded-client-* -> tezos-client-*

src/bin_client/jbuild

@@ -6,8 +6,8 @@
   (libraries (tezos-base
               tezos-rpc-http
               tezos-client-base
-              tezos-embedded-client-genesis
+              tezos-client-genesis
-              tezos-embedded-client-alpha))
+              tezos-client-alpha))
   (flags (:standard -w -9+27-30-32-40@8
                     -safe-string
                     -open Tezos_base__TzPervasives

src/bin_client/tezos-client.opam

@@ -10,9 +10,9 @@ depends: [
   "ocamlfind" { build }
   "jbuilder" { build & >= "1.0+beta15" }
   "tezos-base"
-  "tezos-embedded-client-genesis"
-  "tezos-embedded-client-alpha"
   "tezos-client-base"
+  "tezos-client-genesis"
+  "tezos-client-alpha"
 ]
 build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]

src/lib_protocol_compiler/jbuild_embedded_protocol_template

@@ -1,7 +1,7 @@
 (* -*- tuareg -*- *)
 
-let prefix = "lib_protocol_"
+let prefix = "proto_"
-let dirname = Filename.basename @@ Filename.dirname @@ Sys.getcwd ()
+let dirname = Filename.basename @@ Filename.dirname @@ Filename.dirname @@ Sys.getcwd ()
 
 let predefined_version = None (* to be substituted in opam packages *)
 

src/lib_protocol_compiler/jbuild_protocol_template

@@ -11,8 +11,8 @@
 
 #require "unix"
 
-let prefix = "lib_protocol_"
+let prefix = "proto_"
-let dirname = Filename.basename @@ Sys.getcwd ()
+let dirname = Filename.basename @@ Filename.dirname @@ Sys.getcwd ()
 
 let predefined_version = None (* to be substituted in opam packages *)
 
@@ -28,7 +28,7 @@ let version =
 
 let path =
   match predefined_version with
-  | None -> "src/proto_" ^ version ^ "/lib_protocol_" ^ version
+  | None -> "src/proto_" ^ version ^ "/lib_protocol"
   | Some _ -> "."
 
 let sources =

src/proto_alpha/lib_client/jbuild

@@ -1,8 +1,8 @@
 (jbuild_version 1)
 
 (library
- ((name tezos_embedded_client_alpha)
+ ((name tezos_client_alpha)
-  (public_name tezos-embedded-client-alpha)
+  (public_name tezos-client-alpha)
   (libraries (tezos-base
               tezos-protocol-alpha
               tezos-client-environment

src/proto_genesis/lib_client/client_proto_main.ml

@@ -75,7 +75,7 @@ let commands () =
        @@ stop)
       begin fun timestamp hash fitness validation_passes seckey (cctxt : Client_commands.full_context) ->
         let fitness =
-          Tezos_embedded_client_alpha.Proto_alpha.Fitness_repr.from_int64 fitness in
+          Tezos_client_alpha.Proto_alpha.Fitness_repr.from_int64 fitness in
         bake cctxt ?timestamp cctxt#block
           (Activate { protocol = hash ; validation_passes ; fitness })
           seckey >>=? fun hash ->

src/proto_genesis/lib_client/jbuild

@@ -1,13 +1,13 @@
 (jbuild_version 1)
 
 (library
- ((name tezos_embedded_client_genesis)
+ ((name tezos_client_genesis)
-  (public_name tezos-embedded-client-genesis)
+  (public_name tezos-client-genesis)
   (libraries (tezos-base
               tezos-shell-services
               tezos-client-base
               tezos-client-environment
-              tezos-embedded-client-alpha
+              tezos-client-alpha
               tezos-protocol-genesis))
   (library_flags (:standard -linkall))
   (flags (:standard -w -9+27-30-32-40@8

src/proto_genesis/lib_client/tezos-client-genesis.opam

@@ -10,11 +10,11 @@ depends: [
   "ocamlfind" { build }
   "jbuilder" { build & >= "1.0+beta15" }
   "tezos-base"
-  "tezos-protocol-genesis"
-  "tezos-protocol-alpha"
   "tezos-shell-services"
   "tezos-client-base"
   "tezos-client-environment"
+  "tezos-client-alpha"
+  "tezos-protocol-genesis"
 ]
 build: [
   [ "jbuilder" "build" "-p" name "-j" jobs ]

test/proto_alpha/jbuild

@@ -9,15 +9,15 @@
   (libraries (tezos-base
               tezos-rpc-http
               tezos-client-base
-              tezos-embedded-client-genesis
+              tezos-client-genesis
-              tezos-embedded-client-alpha
+              tezos-client-alpha
               test_lib))
   (flags (:standard -w -9-32 -safe-string
                     -open Tezos_base__TzPervasives
                     -open Tezos_rpc_http
                     -open Tezos_client_base
-                    -open Tezos_embedded_client_genesis
+                    -open Tezos_client_genesis
-                    -open Tezos_embedded_client_alpha))))
+                    -open Tezos_client_alpha))))
 
 (alias
  ((name buildtest)

test/proto_alpha/proto_alpha_helpers.ml

@@ -40,7 +40,7 @@ let dictator_sk =
 
 let activate_alpha () =
   let fitness = Fitness_repr.from_int64 0L in
-  Tezos_embedded_client_genesis.Client_proto_main.bake
+  Tezos_client_genesis.Client_proto_main.bake
     (new Client_rpcs.http_ctxt !rpc_config) (`Head 0)
     (Activate  { protocol = Client_proto_main.protocol ; validation_passes = 1 ;
                  fitness })