diff --git a/src/proto_018_Proxford/lib_delegate/client_daemon.ml b/src/proto_018_Proxford/lib_delegate/client_daemon.ml index 33a90e1977d3c20dcd6b820ed288ea34810a100e..debdf17fe7859f33c3b1777830beb5284388bc7a 100644 --- a/src/proto_018_Proxford/lib_delegate/client_daemon.ml +++ b/src/proto_018_Proxford/lib_delegate/client_daemon.ml @@ -118,8 +118,8 @@ module Baker = struct in let*! () = cctxt#message - "Baker v%a (%s) for %a started." - Tezos_version.Version.pp + "Baker %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short @@ -150,8 +150,8 @@ module Accuser = struct let process () = let*! () = cctxt#message - "Accuser v%a (%s) for %a started." - Tezos_version.Version.pp + "Accuser %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short @@ -192,8 +192,8 @@ module VDF = struct let process () = let*! () = cctxt#message - "VDF daemon v%a (%s) for %a started." - Tezos_version.Version.pp + "VDF daemon %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short diff --git a/src/proto_019_PtParisB/lib_delegate/client_daemon.ml b/src/proto_019_PtParisB/lib_delegate/client_daemon.ml index f64a3a845467c083204b617bd4cbf8e575a192bc..2c7d29d0124ec02d67ca1744fa29402ff8c99564 100644 --- a/src/proto_019_PtParisB/lib_delegate/client_daemon.ml +++ b/src/proto_019_PtParisB/lib_delegate/client_daemon.ml @@ -118,8 +118,8 @@ module Baker = struct in let*! () = cctxt#message - "Baker v%a (%s) for %a started." - Tezos_version.Version.pp + "Baker %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short @@ -157,8 +157,8 @@ module Accuser = struct let process () = let*! () = cctxt#message - "Accuser v%a (%s) for %a started." - Tezos_version.Version.pp + "Accuser %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short @@ -199,8 +199,8 @@ module VDF = struct let process () = let*! () = cctxt#message - "VDF daemon v%a (%s) for %a started." - Tezos_version.Version.pp + "VDF daemon %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short diff --git a/src/proto_alpha/lib_delegate/client_daemon.ml b/src/proto_alpha/lib_delegate/client_daemon.ml index f64a3a845467c083204b617bd4cbf8e575a192bc..2c7d29d0124ec02d67ca1744fa29402ff8c99564 100644 --- a/src/proto_alpha/lib_delegate/client_daemon.ml +++ b/src/proto_alpha/lib_delegate/client_daemon.ml @@ -118,8 +118,8 @@ module Baker = struct in let*! () = cctxt#message - "Baker v%a (%s) for %a started." - Tezos_version.Version.pp + "Baker %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short @@ -157,8 +157,8 @@ module Accuser = struct let process () = let*! () = cctxt#message - "Accuser v%a (%s) for %a started." - Tezos_version.Version.pp + "Accuser %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short @@ -199,8 +199,8 @@ module VDF = struct let process () = let*! () = cctxt#message - "VDF daemon v%a (%s) for %a started." - Tezos_version.Version.pp + "VDF daemon %a (%s) for %a started." + Tezos_version.Version.pp_simple Tezos_version_value.Current_git_info.octez_version Tezos_version_value.Current_git_info.abbreviated_commit_hash Protocol_hash.pp_short diff --git a/tezt/lib_tezos/baker.ml b/tezt/lib_tezos/baker.ml index 211715b535529bacf522a27da46e5136512e08a9..6cea7c9f779241e129d1c82dbe3bdfe815f38a52 100644 --- a/tezt/lib_tezos/baker.ml +++ b/tezt/lib_tezos/baker.ml @@ -77,7 +77,7 @@ let set_ready baker = trigger_ready baker (Some ()) let handle_raw_stdout baker line = - if line =~ rex "^Baker v.+ for .+ started.$" then set_ready baker + if line =~ rex "^Baker .+ for .+ started.$" then set_ready baker let liquidity_baking_votefile ?path vote = let votefile = diff --git a/tezt/lib_tezos/vdf.ml b/tezt/lib_tezos/vdf.ml index 8d6d1268f1d67e0abf69c92dbfab6c503e6d85d7..aa5a9f286237fe8475008b025a302eb7966e4a96 100644 --- a/tezt/lib_tezos/vdf.ml +++ b/tezt/lib_tezos/vdf.ml @@ -61,7 +61,7 @@ let set_ready vdf_baker = trigger_ready vdf_baker (Some ()) let handle_raw_stdout vdf_baker line = - if line =~ rex "^VDF daemon v.+ for .+ started.$" then set_ready vdf_baker + if line =~ rex "^VDF daemon .+ for .+ started.$" then set_ready vdf_baker let create ~protocol ?name ?color ?event_pipe ?runner node = let name = match name with None -> fresh_name () | Some name -> name in