Merge branch 'main' into snapshots

This commit is contained in:
fm
2022-05-21 16:55:48 -03:00
9 changed files with 182 additions and 143 deletions
+1 -2
View File
@@ -89,9 +89,8 @@ func run(log logging.Logger, binaryPath string) error {
// Wait until the nodes in the network are ready
ctx, cancel := context.WithTimeout(context.Background(), healthyTimeout)
defer cancel()
healthyChan := nw.Healthy(ctx)
log.Info("waiting for all nodes to report healthy...")
if err := <-healthyChan; err != nil {
if err := nw.Healthy(ctx); err != nil {
return err
}
+3 -4
View File
@@ -93,10 +93,10 @@ func run(log logging.Logger, binaryPath string) error {
// Wait until the nodes in the network are ready
ctx, cancel := context.WithTimeout(context.Background(), healthyTimeout)
defer cancel()
healthyChan := nw.Healthy(ctx)
log.Info("waiting for all nodes to report healthy...")
if err := <-healthyChan; err != nil {
if err := nw.Healthy(ctx); err != nil {
return err
}
// Print the node names
@@ -150,9 +150,8 @@ func run(log logging.Logger, binaryPath string) error {
// Wait until the nodes in the updated network are ready
ctx, cancel = context.WithTimeout(context.Background(), healthyTimeout)
defer cancel()
healthyChan = nw.Healthy(ctx)
log.Info("waiting for updated network to report healthy...")
if err := <-healthyChan; err != nil {
if err := nw.Healthy(ctx); err != nil {
return err
}