highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-06-28 17:53:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

lnd_test: let assertNumConnections set its own context

Browse Source
This commit is contained in:
Johan T. Halseth 2018-11-28 09:34:50 +01:00
parent 6a4edc8335
commit f989b2ece8
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lnd_test.go
View File

@ -437,8 +437,9 @@ func assertNumOpenChannelsPending(ctxt context.Context, t *harnessTest,
} }
// assertNumConnections asserts number current connections between two peers. // assertNumConnections asserts number current connections between two peers.
func assertNumConnections(ctxt context.Context, t *harnessTest, func assertNumConnections(t *harnessTest, alice, bob *lntest.HarnessNode,
alice, bob *lntest.HarnessNode, expected int) { expected int) {
ctxb := context.Background()
const nPolls = 10 const nPolls = 10
@ -448,11 +449,14 @@ func assertNumConnections(ctxt context.Context, t *harnessTest,
for i := nPolls - 1; i >= 0; i-- { for i := nPolls - 1; i >= 0; i-- {
select { select {
case <-tick.C: case <-tick.C:
ctxt, _ := context.WithTimeout(ctxb, defaultTimeout)
aNumPeers, err := alice.ListPeers(ctxt, &lnrpc.ListPeersRequest{}) aNumPeers, err := alice.ListPeers(ctxt, &lnrpc.ListPeersRequest{})
if err != nil { if err != nil {
t.Fatalf("unable to fetch alice's node (%v) list peers %v", t.Fatalf("unable to fetch alice's node (%v) list peers %v",
alice.NodeID, err) alice.NodeID, err)
} }
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
bNumPeers, err := bob.ListPeers(ctxt, &lnrpc.ListPeersRequest{}) bNumPeers, err := bob.ListPeers(ctxt, &lnrpc.ListPeersRequest{})
if err != nil { if err != nil {
t.Fatalf("unable to fetch bob's node (%v) list peers %v", t.Fatalf("unable to fetch bob's node (%v) list peers %v",
@ -1738,7 +1742,7 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
ctxb := context.Background() ctxb := context.Background()
// Check existing connection. // Check existing connection.
assertNumConnections(ctxb, t, net.Alice, net.Bob, 1) assertNumConnections(t, net.Alice, net.Bob, 1)
chanAmt := maxBtcFundingAmount chanAmt := maxBtcFundingAmount
pushAmt := btcutil.Amount(0) pushAmt := btcutil.Amount(0)
@ -1769,7 +1773,7 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
time.Sleep(time.Millisecond * 300) time.Sleep(time.Millisecond * 300)
// Check existing connection. // Check existing connection.
assertNumConnections(ctxb, t, net.Alice, net.Bob, 1) assertNumConnections(t, net.Alice, net.Bob, 1)
fundingTxID, err := chainhash.NewHash(pendingUpdate.Txid) fundingTxID, err := chainhash.NewHash(pendingUpdate.Txid)
if err != nil { if err != nil {
@ -1825,7 +1829,7 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Check existing connection. // Check existing connection.
assertNumConnections(ctxb, t, net.Alice, net.Bob, 1) assertNumConnections(t, net.Alice, net.Bob, 1)
ctxt, _ = context.WithTimeout(ctxb, channelCloseTimeout) ctxt, _ = context.WithTimeout(ctxb, channelCloseTimeout)
closeChannelAndAssert(ctxt, t, net, net.Alice, chanPoint, true) closeChannelAndAssert(ctxt, t, net, net.Alice, chanPoint, true)
@ -1846,7 +1850,7 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Check zero peer connections. // Check zero peer connections.
assertNumConnections(ctxb, t, net.Alice, net.Bob, 0) assertNumConnections(t, net.Alice, net.Bob, 0)
// Finally, re-connect both nodes. // Finally, re-connect both nodes.
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
@ -1855,7 +1859,7 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Check existing connection. // Check existing connection.
assertNumConnections(ctxb, t, net.Alice, net.Bob, 1) assertNumConnections(t, net.Alice, net.Bob, 1)
// Cleanup by mining the force close and sweep transaction. // Cleanup by mining the force close and sweep transaction.
cleanupForceClose(t, net, net.Alice, chanPoint) cleanupForceClose(t, net, net.Alice, chanPoint)