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

lntest/itest: remove global alice and bob from disconnect test

Browse Source 
This will allow us to start Alice and Bob with additional arguments once
we switch to making unsafe-disconnect true by default.
This commit is contained in:
Conner Fromknecht 2019-11-19 20:12:29 -08:00
parent 8e10da03c7
commit c9c7216768
No known key found for this signature in database
GPG Key ID: E7D737B67FA592C7
1 changed files with 55 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
lntest/itest/lnd_test.go
View File

@ -2172,13 +2172,38 @@ func testOpenChannelAfterReorg(net *lntest.NetworkHarness, t *harnessTest) {
closeReorgedChannelAndAssert(ctxt, t, net, net.Alice, chanPoint, false) closeReorgedChannelAndAssert(ctxt, t, net, net.Alice, chanPoint, false)
} }
// testDisconnectingTargetPeer performs a test which // testDisconnectingTargetPeer performs a test which disconnects Alice-peer from
// disconnects Alice-peer from Bob-peer and then re-connects them again // Bob-peer and then re-connects them again
func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) { func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
ctxb := context.Background() ctxb := context.Background()
alice, err := net.NewNode("Alice", nil)
if err != nil {
t.Fatalf("unable to create new node: %v", err)
}
defer shutdownAndAssert(net, t, alice)
bob, err := net.NewNode("Bob", nil)
if err != nil {
t.Fatalf("unable to create new node: %v", err)
}
defer shutdownAndAssert(net, t, bob)
// Start by connecting Alice and Bob with no channels.
ctxt, _ := context.WithTimeout(ctxb, defaultTimeout)
if err := net.ConnectNodes(ctxt, alice, bob); err != nil {
t.Fatalf("unable to connect Alice's peer to Bob's: err %v", err)
}
// Check existing connection. // Check existing connection.
assertNumConnections(t, net.Alice, net.Bob, 1) assertNumConnections(t, alice, bob, 1)
// Give Alice some coins so she can fund a channel.
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
err = net.SendCoins(ctxt, btcutil.SatoshiPerBitcoin, alice)
if err != nil {
t.Fatalf("unable to send coins to carol: %v", err)
}
chanAmt := lnd.MaxBtcFundingAmount chanAmt := lnd.MaxBtcFundingAmount
pushAmt := btcutil.Amount(0) pushAmt := btcutil.Amount(0)
@ -2186,22 +2211,23 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
// Create a new channel that requires 1 confs before it's considered // Create a new channel that requires 1 confs before it's considered
// open, then broadcast the funding transaction // open, then broadcast the funding transaction
const numConfs = 1 const numConfs = 1
ctxt, _ := context.WithTimeout(ctxb, channelOpenTimeout) ctxt, _ = context.WithTimeout(ctxb, channelOpenTimeout)
pendingUpdate, err := net.OpenPendingChannel(ctxt, net.Alice, net.Bob, pendingUpdate, err := net.OpenPendingChannel(
chanAmt, pushAmt) ctxt, alice, bob, chanAmt, pushAmt,
)
if err != nil { if err != nil {
t.Fatalf("unable to open channel: %v", err) t.Fatalf("unable to open channel: %v", err)
} }
// At this point, the channel's funding transaction will have // At this point, the channel's funding transaction will have been
// been broadcast, but not confirmed. Alice and Bob's nodes // broadcast, but not confirmed. Alice and Bob's nodes should reflect
// should reflect this when queried via RPC. // this when queried via RPC.
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
assertNumOpenChannelsPending(ctxt, t, net.Alice, net.Bob, 1) assertNumOpenChannelsPending(ctxt, t, alice, bob, 1)
// Disconnect Alice-peer from Bob-peer and get error // Disconnect Alice-peer from Bob-peer and get error causes by one
// causes by one pending channel with detach node is existing. // pending channel with detach node is existing.
if err := net.DisconnectNodes(ctxt, net.Alice, net.Bob); err == nil { if err := net.DisconnectNodes(ctxt, alice, bob); err == nil {
t.Fatalf("Bob's peer was disconnected from Alice's"+ t.Fatalf("Bob's peer was disconnected from Alice's"+
" while one pending channel is existing: err %v", err) " while one pending channel is existing: err %v", err)
} }
@ -2209,7 +2235,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(t, net.Alice, net.Bob, 1) assertNumConnections(t, alice, bob, 1)
fundingTxID, err := chainhash.NewHash(pendingUpdate.Txid) fundingTxID, err := chainhash.NewHash(pendingUpdate.Txid)
if err != nil { if err != nil {
@ -2223,15 +2249,15 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
block := mineBlocks(t, net, numConfs, 1)[0] block := mineBlocks(t, net, numConfs, 1)[0]
assertTxInBlock(t, block, fundingTxID) assertTxInBlock(t, block, fundingTxID)
// At this point, the channel should be fully opened and there should // At this point, the channel should be fully opened and there should be
// be no pending channels remaining for either node. // no pending channels remaining for either node.
time.Sleep(time.Millisecond * 300) time.Sleep(time.Millisecond * 300)
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
assertNumOpenChannelsPending(ctxt, t, net.Alice, net.Bob, 0) assertNumOpenChannelsPending(ctxt, t, alice, bob, 0)
// The channel should be listed in the peer information returned by // The channel should be listed in the peer information returned by both
// both peers. // peers.
outPoint := wire.OutPoint{ outPoint := wire.OutPoint{
Hash: *fundingTxID, Hash: *fundingTxID,
Index: pendingUpdate.OutputIndex, Index: pendingUpdate.OutputIndex,
@ -2239,11 +2265,11 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
// Check both nodes to ensure that the channel is ready for operation. // Check both nodes to ensure that the channel is ready for operation.
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
if err := net.AssertChannelExists(ctxt, net.Alice, &outPoint); err != nil { if err := net.AssertChannelExists(ctxt, alice, &outPoint); err != nil {
t.Fatalf("unable to assert channel existence: %v", err) t.Fatalf("unable to assert channel existence: %v", err)
} }
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
if err := net.AssertChannelExists(ctxt, net.Bob, &outPoint); err != nil { if err := net.AssertChannelExists(ctxt, bob, &outPoint); err != nil {
t.Fatalf("unable to assert channel existence: %v", err) t.Fatalf("unable to assert channel existence: %v", err)
} }
@ -2268,13 +2294,13 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
} }
ctxt, _ = context.WithTimeout(ctxb, channelCloseTimeout) ctxt, _ = context.WithTimeout(ctxb, channelCloseTimeout)
closeChannelAndAssert(ctxt, t, net, net.Alice, chanPoint, true) closeChannelAndAssert(ctxt, t, net, alice, chanPoint, true)
// Disconnect Alice-peer from Bob-peer without getting error // Disconnect Alice-peer from Bob-peer without getting error about
// about existing channels. // existing channels.
var predErr error var predErr error
err = wait.Predicate(func() bool { err = wait.Predicate(func() bool {
if err := net.DisconnectNodes(ctxt, net.Alice, net.Bob); err != nil { if err := net.DisconnectNodes(ctxt, alice, bob); err != nil {
predErr = err predErr = err
return false return false
} }
@ -2286,19 +2312,19 @@ func testDisconnectingTargetPeer(net *lntest.NetworkHarness, t *harnessTest) {
} }
// Check zero peer connections. // Check zero peer connections.
assertNumConnections(t, net.Alice, net.Bob, 0) assertNumConnections(t, alice, bob, 0)
// Finally, re-connect both nodes. // Finally, re-connect both nodes.
ctxt, _ = context.WithTimeout(ctxb, defaultTimeout) ctxt, _ = context.WithTimeout(ctxb, defaultTimeout)
if err := net.ConnectNodes(ctxt, net.Alice, net.Bob); err != nil { if err := net.ConnectNodes(ctxt, alice, bob); err != nil {
t.Fatalf("unable to connect Alice's peer to Bob's: err %v", err) t.Fatalf("unable to connect Alice's peer to Bob's: err %v", err)
} }
// Check existing connection. // Check existing connection.
assertNumConnections(t, net.Alice, net.Bob, 1) assertNumConnections(t, 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, alice, chanPoint)
} }
// testFundingPersistence is intended to ensure that the Funding Manager // testFundingPersistence is intended to ensure that the Funding Manager