From 589096680a60422c422a1695608b0e3786b9b8ab Mon Sep 17 00:00:00 2001
From: MBourgoin <mathias.bourgoin@gmail.com>
Date: Tue, 5 Jun 2018 14:05:53 +0200
Subject: [PATCH] Baker: fix cherry-picking

---
 src/proto_alpha/lib_baking/client_baking_lib.ml | 5 ++---
 src/proto_alpha/lib_baking/delegate_commands.ml | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/proto_alpha/lib_baking/client_baking_lib.ml b/src/proto_alpha/lib_baking/client_baking_lib.ml
index cce69e4fc..c0e579c0d 100644
--- a/src/proto_alpha/lib_baking/client_baking_lib.ml
+++ b/src/proto_alpha/lib_baking/client_baking_lib.ml
@@ -98,7 +98,6 @@ let reveal_block_nonces (cctxt : #Proto_alpha.full) block_hashes =
   do_reveal cctxt cctxt#block blocks
 
 let reveal_nonces cctxt () =
-  let block = Block_services.last_baked_block cctxt#block in
   Client_baking_forge.get_unrevealed_nonces
     cctxt cctxt#block >>=? fun nonces ->
   do_reveal cctxt cctxt#block nonces
@@ -109,7 +108,7 @@ let run_daemon cctxt ?max_priority ~endorsement_delay delegates ~endorsement ~ba
       Client_daemon.Endorser.run cctxt
         ~delay:endorsement_delay
         ~min_date:((Time.add (Time.now ()) (Int64.neg 1800L)))
-        (List.map snd delegates) >>=? fun () -> return ()
+        delegates >>=? fun () -> return ()
     else return ()
   in
   let baker =
@@ -117,7 +116,7 @@ let run_daemon cctxt ?max_priority ~endorsement_delay delegates ~endorsement ~ba
       Client_daemon.Baker.run cctxt
         ?max_priority
         ~min_date:((Time.add (Time.now ()) (Int64.neg 1800L)))
-        (List.map snd delegates) >>=? fun () -> return ()
+        delegates >>=? fun () -> return ()
     else return ()
   in
   let accuser =
diff --git a/src/proto_alpha/lib_baking/delegate_commands.ml b/src/proto_alpha/lib_baking/delegate_commands.ml
index 760900989..990bf8618 100644
--- a/src/proto_alpha/lib_baking/delegate_commands.ml
+++ b/src/proto_alpha/lib_baking/delegate_commands.ml
@@ -11,16 +11,15 @@ open Client_proto_args
 open Client_baking_lib
 
 let group =
-  { Cli_entries.name = "delegate" ;
+  { Clic.name = "delegate" ;
     title = "Commands related to delegate operations." }
 
 let commands () =
   let open Clic in
   [
     command ~group ~desc: "Launch a daemon that handles delegate operations."
-      (args5 max_priority_arg endorsement_delay_arg
-         Daemon.baking_switch Daemon.endorsement_switch Daemon.denunciation_switch)
-      (prefixes [ "launch" ; "daemon" ]
+      (args1 max_priority_arg)
+      (prefixes [ "launch" ; "baker" ]
        @@ seq_of_param Client_keys.Public_key_hash.alias_param)
       (fun max_priority delegates cctxt ->
          Client_daemon.Baker.run cctxt