mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-01-18 21:35:24 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8839 from ellemouton/abandonChanItestFix

Browse Source 
itest+lntest: let abandoned channel be either not found or in zombie
This commit is contained in:
Elle 2024-06-14 15:55:36 -04:00 committed by GitHub
commit 68494fd91d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
itest/lnd_misc_test.go
View File

@ -729,7 +729,7 @@ func testAbandonChannel(ht *lntest.HarnessTest) {
require.Len(ht, aliceClosedList.Channels, 1, "alice closed channels")
// Ensure that the channel can no longer be found in the channel graph.
ht.AssertZombieChannel(alice, chanID)
ht.AssertNotInGraph(alice, chanID)
// Make sure the channel is no longer in the channel backup list.
err = wait.NoError(func() error {

31
lntest/harness_assertion.go
View File

@ -1820,6 +1820,37 @@ func (h *HarnessTest) AssertZombieChannel(hn *node.HarnessNode, chanID uint64) {
require.NoError(h, err, "timeout while checking zombie channel")
}
// AssertNotInGraph asserts that a given channel is either not found at all in
// the graph or that it has been marked as a zombie.
func (h *HarnessTest) AssertNotInGraph(hn *node.HarnessNode, chanID uint64) {
ctxt, cancel := context.WithTimeout(h.runCtx, DefaultTimeout)
defer cancel()
err := wait.NoError(func() error {
_, err := hn.RPC.LN.GetChanInfo(
ctxt, &lnrpc.ChanInfoRequest{ChanId: chanID},
)
if err == nil {
return fmt.Errorf("expected error but got nil")
}
switch {
case strings.Contains(err.Error(), "marked as zombie"):
return nil
case strings.Contains(err.Error(), "edge not found"):
return nil
default:
return fmt.Errorf("expected error to contain either "+
"'%s' or '%s' but was: '%v'", "marked as i"+
"zombie", "edge not found", err)
}
}, DefaultTimeout)
require.NoError(h, err, "timeout while checking that channel is not "+
"found in graph")
}
// AssertTxAtHeight gets all of the transactions that a node's wallet has a
// record of at the target height, and finds and returns the tx with the target
// txid, failing if it is not found.