mirrors/tendermint
1
0
Fork 0
mirror of https://github.com/tendermint/tendermint.git synced 2026-01-06 13:26:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

e2e: relax timeouts (#6356)

Browse Source 
* remove duplicate light error

* quieten handling of txs that already exist in the mempool

* notch back e2e timeouts
This commit is contained in:
Callum Waters
2021-04-14 19:53:54 +02:00
committed by GitHub
parent 693e11c6c6
commit b878326396
7 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
light/client.go
View File

@@ -240,7 +240,7 @@ func NewClientFromTrustedStore(
// Validate the number of witnesses. // Validate the number of witnesses.
if len(c.witnesses) < 1 { if len(c.witnesses) < 1 {
return nil, errNoWitnesses{} return nil, ErrNoWitnesses
} }
// Verify witnesses are all on the same chain. // Verify witnesses are all on the same chain.
@@ -1127,7 +1127,7 @@ func (c *Client) compareFirstHeaderWithWitnesses(ctx context.Context, h *types.S
defer c.providerMutex.Unlock() defer c.providerMutex.Unlock()
if len(c.witnesses) < 1 { if len(c.witnesses) < 1 {
return errNoWitnesses{} return ErrNoWitnesses
} }
errc := make(chan error, len(c.witnesses)) errc := make(chan error, len(c.witnesses))

2
light/detector.go
View File

@@ -41,7 +41,7 @@ func (c *Client) detectDivergence(ctx context.Context, primaryTrace []*types.Lig
defer c.providerMutex.Unlock() defer c.providerMutex.Unlock()
if len(c.witnesses) == 0 { if len(c.witnesses) == 0 {
return errNoWitnesses{} return ErrNoWitnesses
} }
// launch one goroutine per witness to retrieve the light block of the target height // launch one goroutine per witness to retrieve the light block of the target height

8
light/errors.go
View File

@@ -89,14 +89,6 @@ func (e errConflictingHeaders) Error() string {
e.Block.Hash(), e.WitnessIndex) e.Block.Hash(), e.WitnessIndex)
} }
// errNoWitnesses means that there are not enough witnesses connected to
// continue running the light client.
type errNoWitnesses struct{}
func (e errNoWitnesses) Error() string {
return "no witnesses connected. please reset light client"
}
// errBadWitness is returned when the witness either does not respond or // errBadWitness is returned when the witness either does not respond or
// responds with an invalid header. // responds with an invalid header.
type errBadWitness struct { type errBadWitness struct {

4
mempool/reactor.go
View File

@@ -181,7 +181,9 @@ func (memR *Reactor) Receive(chID byte, src p2p.Peer, msgBytes []byte) {
} }
for _, tx := range msg.Txs { for _, tx := range msg.Txs {
err = memR.mempool.CheckTx(tx, nil, txInfo) err = memR.mempool.CheckTx(tx, nil, txInfo)
if err != nil { if err == ErrTxInCache {
memR.Logger.Debug("Tx already exists in cache", "tx", txID(tx))
} else if err != nil {
memR.Logger.Info("Could not check tx", "tx", txID(tx), "err", err) memR.Logger.Info("Could not check tx", "tx", txID(tx), "err", err)
} }
} }

2
test/e2e/runner/perturb.go
View File

@@ -66,7 +66,7 @@ func PerturbNode(node *e2e.Node, perturbation e2e.Perturbation) (*rpctypes.Resul
return nil, fmt.Errorf("unexpected perturbation %q", perturbation) return nil, fmt.Errorf("unexpected perturbation %q", perturbation)
} }
status, err := waitForNode(node, 0, 10*time.Second) status, err := waitForNode(node, 0, 20*time.Second)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
test/e2e/runner/start.go
View File

@@ -75,7 +75,7 @@ func Start(testnet *e2e.Testnet) error {
if err := execCompose(testnet.Dir, "up", "-d", node.Name); err != nil { if err := execCompose(testnet.Dir, "up", "-d", node.Name); err != nil {
return err return err
} }
status, err := waitForNode(node, node.StartAt, 1*time.Minute) status, err := waitForNode(node, node.StartAt, 3*time.Minute)
if err != nil { if err != nil {
return err return err
} }

2
test/e2e/tests/app_test.go
View File

@@ -86,7 +86,7 @@ func TestApp_Tx(t *testing.T) {
require.NoError(t, err) require.NoError(t, err)
hash := tx.Hash() hash := tx.Hash()
waitTime := 20 * time.Second waitTime := 30 * time.Second
require.Eventuallyf(t, func() bool { require.Eventuallyf(t, func() bool {
txResp, err := client.Tx(ctx, hash, false) txResp, err := client.Tx(ctx, hash, false)
return err == nil && bytes.Equal(txResp.Tx, tx) return err == nil && bytes.Equal(txResp.Tx, tx)