cleanup errors

memiavl/db.go

@@ -1,15 +1,14 @@
 package memiavl
 
 import (
-	stderrors "errors"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
 	"strconv"
 	"strings"
 	"sync"
 
-	"github.com/pkg/errors"
 	"github.com/tidwall/wal"
 )
 
@@ -301,7 +300,7 @@ func (db *DB) RewriteSnapshotBackground() error {
 }
 
 func (db *DB) Close() error {
-	return stderrors.Join(db.MultiTree.Close(), db.wal.Close())
+	return errors.Join(db.MultiTree.Close(), db.wal.Close())
 }
 
 func snapshotName(version uint32) string {

memiavl/export.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"math"
 
+	"cosmossdk.io/errors"
 	snapshottypes "github.com/cosmos/cosmos-sdk/snapshots/types"
 	"github.com/cosmos/iavl"
 	protoio "github.com/gogo/protobuf/io"
@@ -16,7 +17,7 @@ func (db *DB) Snapshot(height uint64, protoWriter protoio.Writer) error {
 
 	mtree, err := LoadMultiTree(snapshotPath(db.dir, uint32(height)))
 	if err != nil {
-		return err
+		return errors.Wrapf(err, "invalid snapshot height: %d", height)
 	}
 
 	for _, tree := range mtree.trees {

memiavl/go.mod

@@ -12,7 +12,6 @@ require (
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d
 	github.com/ledgerwatch/erigon-lib v0.0.0-20230210071639-db0e7ed11263
-	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.8.1
 	github.com/tendermint/tm-db v0.6.7
 	github.com/tidwall/btree v1.5.0
@@ -59,6 +58,7 @@ require (
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/petermattis/goid v0.0.0-20180202154549-b0b1615b78e5 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect

memiavl/multitree.go

@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"sort"
 
-	"github.com/pkg/errors"
+	"cosmossdk.io/errors"
 
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	"github.com/cosmos/iavl"

memiavl/proof.go

@@ -3,11 +3,11 @@ package memiavl
 import (
 	"bytes"
 	"encoding/binary"
+	"errors"
 	"fmt"
 
 	ics23 "github.com/confio/ics23/go"
 	"github.com/cosmos/iavl"
-	"github.com/pkg/errors"
 )
 
 /*