From 484b1db57da98a43d08e850419a5b8251c9eab9a Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 11 Apr 2024 15:22:50 +0200 Subject: [PATCH 1/4] Baker: Fix version in starting log --- src/proto_018_Proxford/lib_delegate/client_daemon.ml | 4 ++-- src/proto_019_PtParisB/lib_delegate/client_daemon.ml | 4 ++-- src/proto_alpha/lib_delegate/client_daemon.ml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/proto_018_Proxford/lib_delegate/client_daemon.ml b/src/proto_018_Proxford/lib_delegate/client_daemon.ml index 33a90e1977d3..33c2e5d1435c 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 diff --git a/src/proto_019_PtParisB/lib_delegate/client_daemon.ml b/src/proto_019_PtParisB/lib_delegate/client_daemon.ml index f64a3a845467..e905bf34871e 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 diff --git a/src/proto_alpha/lib_delegate/client_daemon.ml b/src/proto_alpha/lib_delegate/client_daemon.ml index f64a3a845467..e905bf34871e 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 -- GitLab From 42d56f7a280f79789cfae6e6050add0f97bb9d40 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 11 Apr 2024 15:37:39 +0200 Subject: [PATCH 2/4] Accuser: Fix version in starting log --- src/proto_018_Proxford/lib_delegate/client_daemon.ml | 4 ++-- src/proto_019_PtParisB/lib_delegate/client_daemon.ml | 4 ++-- src/proto_alpha/lib_delegate/client_daemon.ml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/proto_018_Proxford/lib_delegate/client_daemon.ml b/src/proto_018_Proxford/lib_delegate/client_daemon.ml index 33c2e5d1435c..5d904f1b7edb 100644 --- a/src/proto_018_Proxford/lib_delegate/client_daemon.ml +++ b/src/proto_018_Proxford/lib_delegate/client_daemon.ml @@ -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 diff --git a/src/proto_019_PtParisB/lib_delegate/client_daemon.ml b/src/proto_019_PtParisB/lib_delegate/client_daemon.ml index e905bf34871e..557e03f79382 100644 --- a/src/proto_019_PtParisB/lib_delegate/client_daemon.ml +++ b/src/proto_019_PtParisB/lib_delegate/client_daemon.ml @@ -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 diff --git a/src/proto_alpha/lib_delegate/client_daemon.ml b/src/proto_alpha/lib_delegate/client_daemon.ml index e905bf34871e..557e03f79382 100644 --- a/src/proto_alpha/lib_delegate/client_daemon.ml +++ b/src/proto_alpha/lib_delegate/client_daemon.ml @@ -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 -- GitLab From 9b706b49f6697b2813716a9c0436b4cf9ba34f4b Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Thu, 11 Apr 2024 15:40:01 +0200 Subject: [PATCH 3/4] VDF: Fix version in starting log --- src/proto_018_Proxford/lib_delegate/client_daemon.ml | 4 ++-- src/proto_019_PtParisB/lib_delegate/client_daemon.ml | 4 ++-- src/proto_alpha/lib_delegate/client_daemon.ml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/proto_018_Proxford/lib_delegate/client_daemon.ml b/src/proto_018_Proxford/lib_delegate/client_daemon.ml index 5d904f1b7edb..debdf17fe785 100644 --- a/src/proto_018_Proxford/lib_delegate/client_daemon.ml +++ b/src/proto_018_Proxford/lib_delegate/client_daemon.ml @@ -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 557e03f79382..2c7d29d0124e 100644 --- a/src/proto_019_PtParisB/lib_delegate/client_daemon.ml +++ b/src/proto_019_PtParisB/lib_delegate/client_daemon.ml @@ -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 557e03f79382..2c7d29d0124e 100644 --- a/src/proto_alpha/lib_delegate/client_daemon.ml +++ b/src/proto_alpha/lib_delegate/client_daemon.ml @@ -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 -- GitLab From 80e7e3512a8f1899e2ef8310e8ffa1e3883ee249 Mon Sep 17 00:00:00 2001 From: Killian Delarue Date: Fri, 12 Apr 2024 11:53:37 +0200 Subject: [PATCH 4/4] Tezt: Fix Baker and VDF set_ready --- tezt/lib_tezos/baker.ml | 2 +- tezt/lib_tezos/vdf.ml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tezt/lib_tezos/baker.ml b/tezt/lib_tezos/baker.ml index 211715b53552..6cea7c9f7792 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 8d6d1268f1d6..aa5a9f286237 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 -- GitLab