Merge src/client/embedded/alpha/baker/* into src/client/embedded/alpha/

src/client/embedded/alpha/Makefile

@@ -10,7 +10,15 @@ CLIENT_INTFS := \
   client_proto_programs.mli \
   client_proto_context.mli \
   client_proto_nonces.mli \
-  client_proto_main.mli
+  client_proto_main.mli \
+  client_mining_blocks.mli \
+  client_mining_operations.mli \
+  client_mining_endorsement.mli \
+  client_mining_denunciation.mli \
+  client_mining_revelation.mli \
+  client_mining_forge.mli \
+  client_mining_daemon.mli \
+  client_mining_main.mli \
 
 CLIENT_IMPLS := \
   client_proto_alpha.ml \
@@ -23,7 +31,15 @@ CLIENT_IMPLS := \
   client_proto_programs.ml \
   client_proto_context.ml \
   client_proto_nonces.ml \
-  client_proto_main.ml
+  client_proto_main.ml \
+  client_mining_blocks.ml \
+  client_mining_operations.ml \
+  client_mining_endorsement.ml \
+  client_mining_denunciation.ml \
+  client_mining_revelation.ml \
+  client_mining_forge.ml \
+  client_mining_daemon.ml \
+  client_mining_main.ml
 
 -include baker/Makefile
 

src/client/embedded/alpha/baker/Makefile

@@ -1,23 +0,0 @@
-
-SOURCE_DIRECTORIES += baker
-
-CLIENT_INTFS += \
-  baker/client_mining_blocks.mli \
-  baker/client_mining_operations.mli \
-  baker/client_mining_endorsement.mli \
-  baker/client_mining_denunciation.mli \
-  baker/client_mining_revelation.mli \
-  baker/client_mining_forge.mli \
-  baker/client_mining_daemon.mli \
-  baker/client_mining_main.mli \
-
-CLIENT_IMPLS += \
-  baker/client_mining_blocks.ml \
-  baker/client_mining_operations.ml \
-  baker/client_mining_endorsement.ml \
-  baker/client_mining_denunciation.ml \
-  baker/client_mining_revelation.ml \
-  baker/client_mining_forge.ml \
-  baker/client_mining_daemon.ml \
-  baker/client_mining_main.ml \
-

src/client/embedded/alpha/client_mining_operations.ml

@@ -9,8 +9,6 @@
 
 module Ed25519 = Environment.Ed25519
 
-open Logging.Client.Mining
-
 open Operation
 
 type operation = {

src/client/embedded/alpha/client_mining_revelation.ml

@@ -9,7 +9,6 @@
 
 open Cli_entries
 open Tezos_context
-open Logging.Client.Revelation
 
 let inject_seed_nonce_revelation rpc_config block ?force ?async nonces =
   let operations =

test/proto_alpha/Makefile

@@ -14,7 +14,6 @@ SOURCE_DIRECTORIES := \
   ${SRCDIR}/proto \
   ${SRCDIR}/client/embedded \
   ${SRCDIR}/client/embedded/alpha \
-  ${SRCDIR}/client/embedded/alpha/baker \
   ../lib
 
 LIB := \