refactor: simply errors (#15067)

This commit is contained in:
Julien Robert
2023-02-20 12:03:40 +00:00
committed by GitHub
parent f69b9ff58f
commit 067ee92d4d
51 changed files with 391 additions and 160 deletions
+3 -6
View File
@@ -18,7 +18,7 @@ require (
cosmossdk.io/core v0.5.1 // indirect
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
cosmossdk.io/errors v1.0.0-beta.7 // indirect
cosmossdk.io/log v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78 // indirect
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 // indirect
cosmossdk.io/store v0.0.0-20230206092147-e03195e4b8a7 // indirect
cosmossdk.io/x/tx v0.2.0 // indirect
@@ -155,11 +155,8 @@ require (
// Here are the short-lived replace of Confix
// Replace here are pending PRs, or version to be tagged
replace (
cosmossdk.io/log => ../../log
// TODO use instead a tagged version of the SDK (with CometBFT) when available
github.com/cosmos/cosmos-sdk => ../..
)
// TODO use instead a tagged version of the SDK (with CometBFT) when available
replace github.com/cosmos/cosmos-sdk => ../..
// Fix upstream GHSA-h395-qcrw-5vmq vulnerability.
// TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409
+2
View File
@@ -45,6 +45,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z
cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU=
cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w=
cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78 h1:Scox9JfANgkuAO0F9LMH0e0W5ijmp2BQbsok/U+jDUo=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78/go.mod h1:MyvZ6k9eL0azI/yf8m5gqsM8PgbtFmqjire1OxUMkmc=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8LCQ1JH3dYHh2EsKZ3k8Mr6AqqiOA=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8=
cosmossdk.io/store v0.0.0-20230206092147-e03195e4b8a7 h1:IwyDN/YaQmF+Pmuv8d7vRWMM/k2RjSmPBycMcmd3ICE=
+4 -7
View File
@@ -3,8 +3,8 @@ module cosmossdk.io/tools/cosmovisor
go 1.20
require (
cosmossdk.io/log v0.0.0-00010101000000-000000000000
cosmossdk.io/x/upgrade v0.0.0-20230205135133-41a3dfeced29
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78
cosmossdk.io/x/upgrade v0.0.0-20230220001434-2f1a283f6897
github.com/otiai10/copy v1.9.0
github.com/rs/zerolog v1.29.0
github.com/spf13/cobra v1.6.1
@@ -162,8 +162,5 @@ require (
// Here are the short-lived replace of Comosivosr
// Replace here are pending PRs, or version to be tagged
replace (
cosmossdk.io/log => ../../log
// This can be removed when x/upgrade is bumped
github.com/cosmos/cosmos-sdk => ../..
)
// This can be removed when x/upgrade is bumped
replace github.com/cosmos/cosmos-sdk => ../..
+4 -2
View File
@@ -198,13 +198,15 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z
cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU=
cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w=
cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78 h1:Scox9JfANgkuAO0F9LMH0e0W5ijmp2BQbsok/U+jDUo=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78/go.mod h1:MyvZ6k9eL0azI/yf8m5gqsM8PgbtFmqjire1OxUMkmc=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8LCQ1JH3dYHh2EsKZ3k8Mr6AqqiOA=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8=
cosmossdk.io/store v0.0.0-20230206092147-e03195e4b8a7 h1:IwyDN/YaQmF+Pmuv8d7vRWMM/k2RjSmPBycMcmd3ICE=
cosmossdk.io/store v0.0.0-20230206092147-e03195e4b8a7/go.mod h1:1XOtuYs7jsfQkn7G3VQXB6I+2tHXKHZw2U/AafNbnlk=
cosmossdk.io/x/tx v0.2.0 h1:53f5TIXhpPYJGMm47SUslcV2i8JNBEN3eE08BmxE/Zg=
cosmossdk.io/x/upgrade v0.0.0-20230205135133-41a3dfeced29 h1:mNfdHQhb8o356Hh4fzcNV/DAAIUZk44aSGnBq8g5e4U=
cosmossdk.io/x/upgrade v0.0.0-20230205135133-41a3dfeced29/go.mod h1:PnRmqh7/vHliLlTjvSUNB1HuJ6JaB6F5Z/AM2rs7Iis=
cosmossdk.io/x/upgrade v0.0.0-20230220001434-2f1a283f6897 h1:UpYJD3zIBw4v6evEwMTT/QFvV21pb180NG6tUfG2Xm4=
cosmossdk.io/x/upgrade v0.0.0-20230220001434-2f1a283f6897/go.mod h1:XG8mFIoBGhdsetsaTrWDUIQrXQYT9gurxjJd210MR0A=
dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
filippo.io/edwards25519 v1.0.0-rc.1 h1:m0VOOB23frXZvAOK44usCgLWvtsxIoMCTBGJZlpmGfU=
filippo.io/edwards25519 v1.0.0-rc.1/go.mod h1:N1IkdkCkiLB6tki+MYJoSx2JTY9NUlxZE7eHn5EwJns=
+5 -8
View File
@@ -5,11 +5,11 @@ go 1.20
require (
cosmossdk.io/api v0.3.0
cosmossdk.io/client/v2 v2.0.0-20230205135133-41a3dfeced29
cosmossdk.io/errors v1.0.0-beta.7
github.com/cockroachdb/errors v1.9.1
github.com/hashicorp/go-multierror v1.1.1
github.com/manifoldco/promptui v0.9.0
github.com/pelletier/go-toml/v2 v2.0.6
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.6.1
google.golang.org/grpc v1.53.0
google.golang.org/protobuf v1.28.2-0.20230208135220-49eaa78c6c9c
@@ -19,8 +19,7 @@ require (
cosmossdk.io/collections v0.0.0-20230214153846-b6c6e4e99177 // indirect
cosmossdk.io/core v0.5.1 // indirect
cosmossdk.io/depinject v1.0.0-alpha.3 // indirect
cosmossdk.io/errors v1.0.0-beta.7 // indirect
cosmossdk.io/log v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78 // indirect
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 // indirect
cosmossdk.io/store v0.0.0-20230206092147-e03195e4b8a7 // indirect
filippo.io/edwards25519 v1.0.0-rc.1 // indirect
@@ -89,6 +88,7 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/petermattis/goid v0.0.0-20221215004737-a150e88a970d // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/prometheus/client_golang v1.14.0 // indirect
github.com/prometheus/client_model v0.3.0 // indirect
github.com/prometheus/common v0.40.0 // indirect
@@ -125,8 +125,5 @@ require (
// Here are the short-lived replace of Hubl
// Replace here are pending PRs, or version to be tagged
replace (
cosmossdk.io/log => ../../log
// TODO this can be removed when client/v2 is released with CometBFT changes in the SDK
github.com/cosmos/cosmos-sdk => ../..
)
// TODO this can be removed when client/v2 is released with CometBFT changes in the SDK
replace github.com/cosmos/cosmos-sdk => ../..
+2
View File
@@ -47,6 +47,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z
cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU=
cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w=
cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78 h1:Scox9JfANgkuAO0F9LMH0e0W5ijmp2BQbsok/U+jDUo=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78/go.mod h1:MyvZ6k9eL0azI/yf8m5gqsM8PgbtFmqjire1OxUMkmc=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8LCQ1JH3dYHh2EsKZ3k8Mr6AqqiOA=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8=
cosmossdk.io/store v0.0.0-20230206092147-e03195e4b8a7 h1:IwyDN/YaQmF+Pmuv8d7vRWMM/k2RjSmPBycMcmd3ICE=
+1 -1
View File
@@ -5,8 +5,8 @@ import (
"os"
"path"
"cosmossdk.io/errors"
"github.com/pelletier/go-toml/v2"
"github.com/pkg/errors"
)
type Config struct {
+3 -6
View File
@@ -3,7 +3,7 @@ module cosmossdk.io/tools/rosetta
go 1.19
require (
cosmossdk.io/log v0.0.0
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4
github.com/coinbase/rosetta-sdk-go/types v1.0.0
github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d
@@ -139,8 +139,5 @@ require (
// Here are the short-lived replace of Rosetta
// Replace here are pending PRs, or version to be tagged
replace (
cosmossdk.io/log => ../../log
// TODO use instead a tagged version of the SDK (with CometBFT) when available
github.com/cosmos/cosmos-sdk => ../..
)
// TODO use instead a tagged version of the SDK (with CometBFT) when available
replace github.com/cosmos/cosmos-sdk => ../..
+2
View File
@@ -45,6 +45,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z
cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU=
cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w=
cosmossdk.io/errors v1.0.0-beta.7/go.mod h1:mz6FQMJRku4bY7aqS/Gwfcmr/ue91roMEKAmDUDpBfE=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78 h1:Scox9JfANgkuAO0F9LMH0e0W5ijmp2BQbsok/U+jDUo=
cosmossdk.io/log v0.0.0-20230219145338-9553bf1eec78/go.mod h1:MyvZ6k9eL0azI/yf8m5gqsM8PgbtFmqjire1OxUMkmc=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4 h1:/jnzJ9zFsL7qkV8LCQ1JH3dYHh2EsKZ3k8Mr6AqqiOA=
cosmossdk.io/math v1.0.0-beta.6.0.20230216172121-959ce49135e4/go.mod h1:gUVtWwIzfSXqcOT+lBVz2jyjfua8DoBdzRsIyaUAT/8=
cosmossdk.io/store v0.0.0-20230206092147-e03195e4b8a7 h1:IwyDN/YaQmF+Pmuv8d7vRWMM/k2RjSmPBycMcmd3ICE=