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

lnd_test: check for coop closed channel among WaitingClose instead of PendingClosed

Browse Source
This commit is contained in:
Johan T. Halseth 2018-05-18 15:21:31 +02:00
parent 921f02fe22
commit 74205a64fd
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lnd_test.go
View File

@ -216,7 +216,7 @@ func closeChannelAndAssert(ctx context.Context, t *harnessTest,
chanPointStr := fmt.Sprintf("%v:%v", txid, fundingChanPoint.OutputIndex) chanPointStr := fmt.Sprintf("%v:%v", txid, fundingChanPoint.OutputIndex)
// If we didn't force close the transaction, at this point, the channel // If we didn't force close the transaction, at this point, the channel
// should now be marked as being in the state of "pending close". // should now be marked as being in the state of "waiting close".
if !force { if !force {
pendingChansRequest := &lnrpc.PendingChannelsRequest{} pendingChansRequest := &lnrpc.PendingChannelsRequest{}
pendingChanResp, err := node.PendingChannels(ctx, pendingChansRequest) pendingChanResp, err := node.PendingChannels(ctx, pendingChansRequest)
@ -224,14 +224,14 @@ func closeChannelAndAssert(ctx context.Context, t *harnessTest,
t.Fatalf("unable to query for pending channels: %v", err) t.Fatalf("unable to query for pending channels: %v", err)
} }
var found bool var found bool
for _, pendingClose := range pendingChanResp.PendingClosingChannels { for _, pendingClose := range pendingChanResp.WaitingCloseChannels {
if pendingClose.Channel.ChannelPoint == chanPointStr { if pendingClose.Channel.ChannelPoint == chanPointStr {
found = true found = true
break break
} }
} }
if !found { if !found {
t.Fatalf("channel not marked as pending close") t.Fatalf("channel not marked as waiting close")
} }
} }
@ -247,7 +247,7 @@ func closeChannelAndAssert(ctx context.Context, t *harnessTest,
assertTxInBlock(t, block, closingTxid) assertTxInBlock(t, block, closingTxid)
// Finally, the transaction should no longer be in the pending close // Finally, the transaction should no longer be in the waiting close
// state as we've just mined a block that should include the closing // state as we've just mined a block that should include the closing
// transaction. This only applies for co-op close channels though. // transaction. This only applies for co-op close channels though.
if !force { if !force {
@ -260,7 +260,7 @@ func closeChannelAndAssert(ctx context.Context, t *harnessTest,
return false return false
} }
for _, pendingClose := range pendingChanResp.PendingClosingChannels { for _, pendingClose := range pendingChanResp.WaitingCloseChannels {
if pendingClose.Channel.ChannelPoint == chanPointStr { if pendingClose.Channel.ChannelPoint == chanPointStr {
return false return false
} }