akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

lnd_test: give peers more time to successfully attempt connection

Browse Source 
We might hit a connection refused error in cases where the peer connects
to us exactly as we try to connect to it. We retry the connection within
a wait predicat, as it should be the case that the other peer
establishes the connection, and the two peers actually connects.
This commit is contained in:
Johan T. Halseth 2019-09-25 12:43:09 +02:00
parent 867e972808
commit a3a04992b4
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
lntest/harness.go
View File

@ -435,44 +435,61 @@ func (n *NetworkHarness) EnsureConnected(ctx context.Context, a, b *HarnessNode)
},
}
ctxt, _ = context.WithTimeout(ctx, 15*time.Second)
err = n.connect(ctxt, req, a)
switch {
var predErr error
err = wait.Predicate(func() bool {
ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
defer cancel()
// Request was successful, wait for both to display the
// connection.
case err == nil:
return errConnectionRequested
err := n.connect(ctx, req, a)
switch {
// If the two are already connected, we return early with no
// error.
case strings.Contains(err.Error(), "already connected to peer"):
return nil
// Request was successful, wait for both to display the
// connection.
case err == nil:
predErr = errConnectionRequested
return true
default:
return err
// If the two are already connected, we return early
// with no error.
case strings.Contains(
err.Error(), "already connected to peer",
):
predErr = nil
return true
default:
predErr = err
return false
}
}, DefaultTimeout)
if err != nil {
return fmt.Errorf("connection not succeeded within 15 "+
"seconds: %v", predErr)
}
return predErr
}
aErr := tryConnect(a, b)
bErr := tryConnect(b, a)
switch {
// If both reported already being connected to each other, we can exit
// early.
case aErr == nil && bErr == nil:
// If both reported already being connected to each other, we
// can exit early.
return nil
// Return any critical errors returned by either alice.
case aErr != nil && aErr != errConnectionRequested:
// Return any critical errors returned by either alice.
return aErr
// Return any critical errors returned by either bob.
case bErr != nil && bErr != errConnectionRequested:
// Return any critical errors returned by either bob.
return bErr
// Otherwise one or both requested a connection, so we wait for the
// peers lists to reflect the connection.
default:
// Otherwise one or both requested a connection, so we wait for
// the peers lists to reflect the connection.
}
findSelfInPeerList := func(a, b *HarnessNode) bool {