multi: use the "errors" package everywhere

Replace all usages of the "github.com/go-errors/errors" and
"github.com/pkg/errors" packages with the standard lib's "errors"
package. This ensures that error wrapping and `errors.Is` checks will
work as expected.
This commit is contained in:
Elle Mouton committed 2025-06-30 09:46:55 +02:00
1 parent 5f961e4349
commit 8cf567b948
44 files changed
+114 -109

No files matched your search

+1 -1
View File
@@ -4,6 +4,7 @@ import (
"bytes"
"context"
"encoding/binary"
"errors"
"fmt"
"net"
"os"
@@ -12,7 +13,6 @@ import (
"github.com/btcsuite/btcd/btcec/v2"
"github.com/btcsuite/btcd/wire"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/go-errors/errors"
mig "github.com/lightningnetwork/lnd/channeldb/migration"
"github.com/lightningnetwork/lnd/channeldb/migration12"
"github.com/lightningnetwork/lnd/channeldb/migration13"
+3 -2
View File
@@ -2,10 +2,11 @@ package channeldb
import (
"bytes"
"errors"
"fmt"
"testing"
"github.com/btcsuite/btcwallet/walletdb"
"github.com/go-errors/errors"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/stretchr/testify/require"
)
@@ -48,7 +49,7 @@ func applyMigration(t *testing.T, beforeMigration, afterMigration func(d *DB),
if dryRun && r != ErrDryRunMigrationOK {
t.Fatalf("expected dry run migration OK")
}
err = errors.New(r)
err = fmt.Errorf("%v", r)
}
if err == nil && shouldFail {
+1 -1
View File
@@ -3,6 +3,7 @@ package lnwire
import (
"bytes"
"encoding/binary"
"errors"
"fmt"
"image/color"
"io"
@@ -13,7 +14,6 @@ import (
"github.com/btcsuite/btcd/btcutil"
"github.com/btcsuite/btcd/chaincfg/chainhash"
"github.com/btcsuite/btcd/wire"
"github.com/go-errors/errors"
"github.com/lightningnetwork/lnd/tor"
)
+1 -2
View File
@@ -9,7 +9,6 @@ import (
"io"
"github.com/davecgh/go-spew/spew"
"github.com/go-errors/errors"
"github.com/lightningnetwork/lnd/tlv"
)
@@ -1451,7 +1450,7 @@ func makeEmptyOnionError(code FailCode) (FailureMessage, error) {
return &FailInvalidBlinding{}, nil
default:
return nil, errors.Errorf("unknown error code: %v", code)
return nil, fmt.Errorf("unknown error code: %v", code)
}
}
+2 -2
View File
@@ -1,9 +1,9 @@
package migration_01_to_11
import (
"fmt"
"testing"
"github.com/go-errors/errors"
"github.com/lightningnetwork/lnd/kvdb"
)
@@ -33,7 +33,7 @@ func applyMigration(t *testing.T, beforeMigration, afterMigration func(d *DB),
defer func() {
if r := recover(); r != nil {
err = errors.New(r)
err = fmt.Errorf("%v", r)
}
if err == nil && shouldFail {
@@ -4,6 +4,7 @@ import (
"bytes"
"crypto/sha256"
"encoding/binary"
"errors"
"fmt"
"math/rand"
"reflect"
@@ -12,7 +13,6 @@ import (
"github.com/btcsuite/btcd/btcutil"
"github.com/davecgh/go-spew/spew"
"github.com/go-errors/errors"
lnwire "github.com/lightningnetwork/lnd/channeldb/migration/lnwire21"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lntypes"
+1 -1
View File
@@ -3,11 +3,11 @@ package channeldb
import (
"bytes"
"encoding/binary"
"errors"
"fmt"
"io"
"sync"
"github.com/go-errors/errors"
"github.com/lightningnetwork/lnd/kvdb"
"github.com/lightningnetwork/lnd/lnwire"
)
+1 -1
View File
@@ -1,11 +1,11 @@
package channeldb
import (
"errors"
"reflect"
"testing"
"github.com/davecgh/go-spew/spew"
"github.com/go-errors/errors"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/stretchr/testify/require"
)