From d16eb252e3f43fd53671a5ba78cf63ea726a765e Mon Sep 17 00:00:00 2001 From: Oliver Gugger Date: Fri, 15 Jul 2022 16:36:23 +0200 Subject: [PATCH] funding: don't abort if cleanup fails If we can't clean up pending channels from a previous batch attempt, that shouldn't block startup. So instead of shutting down, we just log the warning and continue. --- funding/batch.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/funding/batch.go b/funding/batch.go index a6aad2d..0f55682 100644 --- a/funding/batch.go +++ b/funding/batch.go @@ -2,10 +2,10 @@ package funding import ( "context" - "fmt" "strings" "github.com/btcsuite/btcd/wire" + "github.com/davecgh/go-spew/spew" "github.com/lightninglabs/lndclient" "github.com/lightninglabs/pool/order" "github.com/lightningnetwork/lnd/lnrpc" @@ -100,8 +100,13 @@ func AbandonCanceledChannels(matchedOrders map[order.Nonce][]*order.MatchedOrder batchTx, wallet, ourOrder, matchedOrder, ) if err != nil { - return fmt.Errorf("error locating channel "+ - "outpoint: %v", err) + log.Warnf("Could not find channel output for "+ + "our_order=%v, matched_order=%v in "+ + "latest batch TX=%v", + ourOrderNonce.String(), + matchedOrder.Order.Nonce(), + spew.Sdump(batchTx)) + continue } channelPoint := &lnrpc.ChannelPoint{