mirror of
https://github.com/tendermint/tendermint.git
synced 2026-02-04 11:02:06 +00:00
8f06e0c9e7
This is a mostly-automated fixup using Comby (https://comby.dev) to remove lexically-obvious redundant error checks. No functional changes are intended. To reproduce the core change: # Collapse redundant error check conditionals % comby -in-place 'if err != nil { return err } return nil' 'return err' .go # Fold out unnecessary error temporaries % comby -in-place ':[spc~^\s*]err :[~:?]= :[any] return err' ':[spc]return :[any]' .go Fixes #6479 and related cases.
32 lines
950 B
Go
32 lines
950 B
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
e2e "github.com/tendermint/tendermint/test/e2e/pkg"
|
|
)
|
|
|
|
// Wait waits for a number of blocks to be produced, and for all nodes to catch
|
|
// up with it.
|
|
func Wait(testnet *e2e.Testnet, blocks int64) error {
|
|
block, _, err := waitForHeight(testnet, 0)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
return WaitUntil(testnet, block.Height+blocks)
|
|
}
|
|
|
|
// WaitUntil waits until a given height has been reached.
|
|
func WaitUntil(testnet *e2e.Testnet, height int64) error {
|
|
logger.Info(fmt.Sprintf("Waiting for all nodes to reach height %v...", height))
|
|
_, err := waitForAllNodes(testnet, height, waitingTime(len(testnet.Nodes)))
|
|
return err
|
|
}
|
|
|
|
// waitingTime estimates how long it should take for a node to reach the height.
|
|
// More nodes in a network implies we may expect a slower network and may have to wait longer.
|
|
func waitingTime(nodes int) time.Duration {
|
|
return time.Minute + (time.Duration(nodes) * (30 * time.Second))
|
|
}
|