test: only assert pending close channels if didn't force close

This commit is contained in:
Olaoluwa Osuntokun committed 2017-05-04 18:06:18 -07:00
1 parent 18a2c8a455
commit 533cd69c7b
1 file changed
+5 -3
+5 -3
View File
@@ -188,8 +188,9 @@ func closeChannelAndAssert(ctx context.Context, t *harnessTest, net *networkHarn
} }
chanPointStr := fmt.Sprintf("%v:%v", txid, fundingChanPoint.OutputIndex) chanPointStr := fmt.Sprintf("%v:%v", txid, fundingChanPoint.OutputIndex)
// At this point, the channel should now be marked as being in the // If we didn't force close the transaction, at this point, the channel
// state of "pending close". // should now be marked as being in the state of "pending close".
if !force {
pendingChansRequest := &lnrpc.PendingChannelRequest{} pendingChansRequest := &lnrpc.PendingChannelRequest{}
pendingChanResp, err := node.PendingChannels(ctx, pendingChansRequest) pendingChanResp, err := node.PendingChannels(ctx, pendingChansRequest)
if err != nil { if err != nil {
@@ -205,6 +206,7 @@ func closeChannelAndAssert(ctx context.Context, t *harnessTest, net *networkHarn
if !found { if !found {
t.Fatalf("channel not marked as pending close") t.Fatalf("channel not marked as pending close")
} }
}
// Finally, generate a single block, wait for the final close status // Finally, generate a single block, wait for the final close status
// update, then ensure that the closing transaction was included in the // update, then ensure that the closing transaction was included in the
@@ -442,7 +444,7 @@ peersPoll:
OutputIndex: pendingUpdate.OutputIndex, OutputIndex: pendingUpdate.OutputIndex,
} }
ctxt, _ = context.WithTimeout(ctxb, timeout) ctxt, _ = context.WithTimeout(ctxb, timeout)
closeChannelAndAssert(ctxt, t, net, net.Alice, chanPoint, true) closeChannelAndAssert(ctxt, t, net, net.Alice, chanPoint, false)
} }
// testChannelBalance creates a new channel between Alice and Bob, then // testChannelBalance creates a new channel between Alice and Bob, then