diff --git a/errors/abci_test.go b/errors/abci_test.go index b9370bd7d6..1ba9806347 100644 --- a/errors/abci_test.go +++ b/errors/abci_test.go @@ -143,7 +143,7 @@ func (s *abciTestSuite) TestABCIInfoStacktrace() { }, } - const thisTestSrc = "github.com/cosmos/cosmos-sdk/errors.(*abciTestSuite).TestABCIInfoStacktrace" + const thisTestSrc = "cosmossdk.io/errors.(*abciTestSuite).TestABCIInfoStacktrace" for testName, tc := range cases { _, _, log := ABCIInfo(tc.err, tc.debug) diff --git a/errors/errors_test.go b/errors/errors_test.go index ff5d1e4106..028ec5141d 100644 --- a/errors/errors_test.go +++ b/errors/errors_test.go @@ -3,14 +3,11 @@ package errors import ( stdlib "errors" "fmt" - "testing" - - grpcstatus "google.golang.org/grpc/status" - - "google.golang.org/grpc/codes" - "github.com/pkg/errors" "github.com/stretchr/testify/suite" + "google.golang.org/grpc/codes" + grpcstatus "google.golang.org/grpc/status" + "testing" ) type errorsTestSuite struct { diff --git a/errors/go.mod b/errors/go.mod index da0c9aadcf..c798fa8677 100644 --- a/errors/go.mod +++ b/errors/go.mod @@ -1,4 +1,4 @@ -module github.com/cosmos/cosmos-sdk/errors +module cosmossdk.io/errors go 1.18 diff --git a/errors/stacktrace.go b/errors/stacktrace.go index b01a3e8091..dc60870763 100644 --- a/errors/stacktrace.go +++ b/errors/stacktrace.go @@ -48,9 +48,9 @@ func trimInternal(st errors.StackTrace) errors.StackTrace { // manual error creation, or runtime for caught panics for matchesFunc(st[0], // where we create errors - "github.com/cosmos/cosmos-sdk/errors.Wrap", - "github.com/cosmos/cosmos-sdk/errors.Wrapf", - "github.com/cosmos/cosmos-sdk/errors.WithType", + "cosmossdk.io/errors.Wrap", + "cosmossdk.io/errors.Wrapf", + "cosmossdk.io/errors.WithType", // runtime are added on panics "runtime.", // _test is defined in coverage tests, causing failure diff --git a/errors/stacktrace_test.go b/errors/stacktrace_test.go index af91cb5951..c0a8d6141c 100644 --- a/errors/stacktrace_test.go +++ b/errors/stacktrace_test.go @@ -32,8 +32,8 @@ func (s *errorsTestSuite) TestStackTrace() { // Wrapping code is unwanted in the errors stack trace. unwantedSrc := []string{ - "github.com/cosmos/cosmos-sdk/errors.Wrap\n", - "github.com/cosmos/cosmos-sdk/errors.Wrapf\n", + "cosmossdk.io/errors.Wrap\n", + "cosmossdk.io/errors.Wrapf\n", "runtime.goexit\n", } const thisTestSrc = "errors/stacktrace_test.go" diff --git a/go.mod b/go.mod index dee5c9c8a5..00f0c4a3c5 100644 --- a/go.mod +++ b/go.mod @@ -3,6 +3,7 @@ go 1.18 module github.com/cosmos/cosmos-sdk require ( + cosmossdk.io/errors v1.0.0-beta.6 cosmossdk.io/math v1.0.0-beta.2 github.com/99designs/keyring v1.1.6 github.com/armon/go-metrics v0.3.11 @@ -15,7 +16,6 @@ require ( github.com/cosmos/cosmos-proto v1.0.0-alpha7 github.com/cosmos/cosmos-sdk/api v0.1.0 github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1 - github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/iavl v0.18.0 github.com/cosmos/ledger-cosmos-go v0.11.1 diff --git a/go.sum b/go.sum index 9ea0ba3823..fc2bdbe993 100644 --- a/go.sum +++ b/go.sum @@ -65,6 +65,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9 cloud.google.com/go/storage v1.14.0 h1:6RRlFMv1omScs6iq2hfE3IvgE+l6RfJPampq8UZc5TU= cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3fOKtUw0Xmo= contrib.go.opencensus.io/exporter/stackdriver v0.13.4/go.mod h1:aXENhDJ1Y4lIg4EUaVTwzvYETVNZk10Pu26tevFKLUc= +cosmossdk.io/errors v1.0.0-beta.6 h1:aIn9ZemUfjdgVHNuAgEcKklbOa+ygv6u9gbWOGvzIoU= +cosmossdk.io/errors v1.0.0-beta.6/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= cosmossdk.io/math v1.0.0-beta.2 h1:17hSVc9ne1c31IaLDfjRojtN+y4Rd2N8H/6Fht2sBzw= cosmossdk.io/math v1.0.0-beta.2/go.mod h1:u/MXvf8wbUbCsAEyQSSYXXMsczAsFX48e2D6JI86T4o= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= @@ -246,8 +248,6 @@ github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hk github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw= github.com/cosmos/cosmos-sdk/api v0.1.0 h1:xfSKM0e9p+EJTMQnf5PbWE6VT8ruxTABIJ64Rd064dE= github.com/cosmos/cosmos-sdk/api v0.1.0/go.mod h1:CupqQBskAOiTXO1XDZ/wrtWzN/wTxUvbQmOqdUhR8wI= -github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 h1:9ebZL9/nCkaxer3kWWHs0YT8OOmHd7xohULM8Weep7M= -github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5/go.mod h1:wDFkBmFsFolsfsAfsLON7xX0EuWIvNxMO7NDjrijYU8= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= github.com/cosmos/iavl v0.18.0 h1:02ur4vnalMR2GuWCFNkuseUcl/BCVmg9tOeHOGiZOkE= diff --git a/orm/go.mod b/orm/go.mod index cb38df0fb4..4f2b389e20 100644 --- a/orm/go.mod +++ b/orm/go.mod @@ -3,9 +3,9 @@ module github.com/cosmos/cosmos-sdk/orm go 1.18 require ( + cosmossdk.io/errors v1.0.0-beta.6 github.com/cosmos/cosmos-proto v1.0.0-alpha7 github.com/cosmos/cosmos-sdk/api v0.1.0 - github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.5.8 github.com/iancoleman/strcase v0.2.0 diff --git a/orm/go.sum b/orm/go.sum index cb61eadaea..794d5adefe 100644 --- a/orm/go.sum +++ b/orm/go.sum @@ -1,5 +1,7 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cosmossdk.io/errors v1.0.0-beta.6 h1:aIn9ZemUfjdgVHNuAgEcKklbOa+ygv6u9gbWOGvzIoU= +cosmossdk.io/errors v1.0.0-beta.6/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/DataDog/zstd v1.4.1/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ= @@ -33,8 +35,6 @@ github.com/cosmos/cosmos-proto v1.0.0-alpha7 h1:yqYUOHF2jopwZh4dVQp3xgqwftE5/2hk github.com/cosmos/cosmos-proto v1.0.0-alpha7/go.mod h1:dosO4pSAbJF8zWCzCoTWP7nNsjcvSUBQmniFxDg5daw= github.com/cosmos/cosmos-sdk/api v0.1.0 h1:xfSKM0e9p+EJTMQnf5PbWE6VT8ruxTABIJ64Rd064dE= github.com/cosmos/cosmos-sdk/api v0.1.0/go.mod h1:CupqQBskAOiTXO1XDZ/wrtWzN/wTxUvbQmOqdUhR8wI= -github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5 h1:9ebZL9/nCkaxer3kWWHs0YT8OOmHd7xohULM8Weep7M= -github.com/cosmos/cosmos-sdk/errors v1.0.0-beta.5/go.mod h1:wDFkBmFsFolsfsAfsLON7xX0EuWIvNxMO7NDjrijYU8= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= diff --git a/orm/model/ormdb/json.go b/orm/model/ormdb/json.go index c8c78252ea..3a64ae52fb 100644 --- a/orm/model/ormdb/json.go +++ b/orm/model/ormdb/json.go @@ -11,7 +11,7 @@ import ( "google.golang.org/protobuf/reflect/protoreflect" - "github.com/cosmos/cosmos-sdk/errors" + "cosmossdk.io/errors" ) func (m moduleDB) DefaultJSON(target ormjson.WriteTarget) error { diff --git a/orm/model/ormtable/table_test.go b/orm/model/ormtable/table_test.go index 06df3f3cb4..b02bbe019f 100644 --- a/orm/model/ormtable/table_test.go +++ b/orm/model/ormtable/table_test.go @@ -22,8 +22,8 @@ import ( "github.com/cosmos/cosmos-sdk/orm/types/kv" + sdkerrors "cosmossdk.io/errors" queryv1beta1 "github.com/cosmos/cosmos-sdk/api/cosmos/base/query/v1beta1" - sdkerrors "github.com/cosmos/cosmos-sdk/errors" "github.com/cosmos/cosmos-sdk/orm/encoding/ormkv" "github.com/cosmos/cosmos-sdk/orm/internal/testkv" "github.com/cosmos/cosmos-sdk/orm/internal/testpb" diff --git a/orm/types/ormerrors/errors.go b/orm/types/ormerrors/errors.go index 7f660927ad..d62d1f0ba2 100644 --- a/orm/types/ormerrors/errors.go +++ b/orm/types/ormerrors/errors.go @@ -1,7 +1,7 @@ package ormerrors import ( - "github.com/cosmos/cosmos-sdk/errors" + "cosmossdk.io/errors" "google.golang.org/grpc/codes" ) diff --git a/types/errors/doc.go b/types/errors/doc.go index 31f9e6cdaa..e55370a43d 100644 --- a/types/errors/doc.go +++ b/types/errors/doc.go @@ -1,9 +1,9 @@ // Package errors provides a shared set of errors for use in the SDK, -// aliases functionality in the github.com/cosmos/cosmos-sdk/errors module +// aliases functionality in the cosmossdk.io/errors module // that used to be in this package, and provides some helpers for converting // errors to ABCI response code. // -// New code should generally import github.com/cosmos/cosmos-sdk/errors directly +// New code should generally import cosmossdk.io/errors directly // and define a custom set of errors in custom codespace, rather than importing // this package. package errors diff --git a/types/errors/errors.go b/types/errors/errors.go index aa6bffe061..f16464eca4 100644 --- a/types/errors/errors.go +++ b/types/errors/errors.go @@ -1,13 +1,13 @@ package errors import ( - errorsmod "github.com/cosmos/cosmos-sdk/errors" + errorsmod "cosmossdk.io/errors" ) // Type Aliases to errors module // // Deprecated: functionality of this package has been moved to it's own module: -// github.com/cosmos/cosmos-sdk/errors +// cosmossdk.io/errors // Please use the above module instead of this package. var ( SuccessABCICode = errorsmod.SuccessABCICode @@ -27,7 +27,7 @@ var ( // Error type alias for errorsmod.Error // -// Deprecated: the type has been moved to github.com/cosmos/cosmos-sdk/errors +// Deprecated: the type has been moved to cosmossdk.io/errors // module. Please use the above module instead of this package. type Error = errorsmod.Error