From d0dc85f9869d7cb3c855d8f806f8024a63da3aef Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 15:44:18 +0100 Subject: [PATCH 01/14] use logger from sdk --- baseapp/baseapp_test.go | 5 +++++ baseapp/block_gas_test.go | 1 + client/grpc_query_test.go | 1 + go.mod | 1 + go.sum | 2 ++ log/noop_logger.go | 8 ++++---- simapp/go.mod | 2 ++ simapp/go.sum | 2 ++ simapp/test_helpers.go | 1 + store/go.mod | 2 ++ store/iavl/store_test.go | 1 + store/pruning/manager_test.go | 1 + store/rootmulti/proof_test.go | 1 + store/rootmulti/snapshot_test.go | 1 + store/rootmulti/store_test.go | 1 + store/snapshots/helpers_test.go | 1 + store/types/iterator_test.go | 1 + tests/go.mod | 1 + tests/go.sum | 2 ++ testutil/context.go | 1 + testutil/network/network.go | 3 ++- testutil/sims/simulation_helpers_test.go | 3 +++ tools/cosmovisor/go.sum | 1 + x/authz/module/abci_test.go | 4 ++++ x/evidence/go.sum | 2 ++ x/feegrant/go.sum | 2 ++ x/genutil/client/cli/genaccount_test.go | 4 +++- x/nft/go.sum | 2 ++ x/params/types/subspace_test.go | 1 + x/upgrade/go.mod | 1 + x/upgrade/go.sum | 2 ++ 31 files changed, 55 insertions(+), 6 deletions(-) diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 2cf579290cb5..24ab5e8735e6 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -18,6 +18,11 @@ import ( "cosmossdk.io/store/snapshots" snapshottypes "cosmossdk.io/store/snapshots/types" storetypes "cosmossdk.io/store/types" + dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" + "github.com/stretchr/testify/require" + abci "github.com/tendermint/tendermint/abci/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" baseapptestutil "github.com/cosmos/cosmos-sdk/baseapp/testutil" diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go index bc854625d9a3..448337942634 100644 --- a/baseapp/block_gas_test.go +++ b/baseapp/block_gas_test.go @@ -12,6 +12,7 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" store "cosmossdk.io/store/types" diff --git a/client/grpc_query_test.go b/client/grpc_query_test.go index dfff4d40d621..82a144566d59 100644 --- a/client/grpc_query_test.go +++ b/client/grpc_query_test.go @@ -11,6 +11,7 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/suite" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/go.mod b/go.mod index 6bc8f208a9f1..9d991618715b 100644 --- a/go.mod +++ b/go.mod @@ -22,6 +22,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogogateway v1.2.0 github.com/cosmos/gogoproto v1.4.4 diff --git a/go.sum b/go.sum index 942bab200c6b..4def95249ada 100644 --- a/go.sum +++ b/go.sum @@ -179,6 +179,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a h1:2humuGPw3O5riJVFq/E2FRjF57UrO97W1qJcGVmK+6k= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a/go.mod h1:c8IO23vgNxueCCJlSI9awQtcxsvc+buzaeThB85qfBU= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/log/noop_logger.go b/log/noop_logger.go index feedd5719070..de41f188a48a 100644 --- a/log/noop_logger.go +++ b/log/noop_logger.go @@ -6,13 +6,13 @@ var _ Logger = &NoOp{} type NoOp struct{} -func NewNoOpLogger() *NoOp { +func NewNopLogger() Logger { return &NoOp{} } -func (l NoOp) Debug(msg string, keyvals ...interface{}) {} -func (l NoOp) Info(msg string, keyvals ...interface{}) {} -func (l NoOp) Error(msg string, keyvals ...interface{}) {} +func (l *NoOp) Debug(msg string, keyvals ...interface{}) {} +func (l *NoOp) Info(msg string, keyvals ...interface{}) {} +func (l *NoOp) Error(msg string, keyvals ...interface{}) {} func (l NoOp) With(i ...interface{}) cmlog.Logger { return l diff --git a/simapp/go.mod b/simapp/go.mod index 0df1e3401bec..b1b099a8c74d 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -28,6 +28,8 @@ require ( google.golang.org/protobuf v1.28.2-0.20230130093322-0430d694e04a ) +require github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + require ( cloud.google.com/go v0.105.0 // indirect cloud.google.com/go/compute v1.14.0 // indirect diff --git a/simapp/go.sum b/simapp/go.sum index cb70aeb345c9..e8945b308802 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -201,6 +201,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index 2621e3f0f116..e678c9d5f725 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -13,6 +13,7 @@ import ( tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" pruningtypes "cosmossdk.io/store/pruning/types" diff --git a/store/go.mod b/store/go.mod index a71c058457c1..46db69a9b1a6 100644 --- a/store/go.mod +++ b/store/go.mod @@ -24,6 +24,8 @@ require ( gotest.tools/v3 v3.4.0 ) +require github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + require ( cosmossdk.io/api v0.2.6 // indirect cosmossdk.io/collections v0.0.0-20230202103518-eb86b68caea0 // indirect diff --git a/store/iavl/store_test.go b/store/iavl/store_test.go index 49d21f239259..a93449e9637d 100644 --- a/store/iavl/store_test.go +++ b/store/iavl/store_test.go @@ -8,6 +8,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/iavl" "github.com/stretchr/testify/require" diff --git a/store/pruning/manager_test.go b/store/pruning/manager_test.go index a9ae8b676692..9a411d9928a6 100644 --- a/store/pruning/manager_test.go +++ b/store/pruning/manager_test.go @@ -8,6 +8,7 @@ import ( "github.com/cometbft/cometbft/libs/log" db "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" diff --git a/store/rootmulti/proof_test.go b/store/rootmulti/proof_test.go index 55eeaace3c96..c7898f9e8464 100644 --- a/store/rootmulti/proof_test.go +++ b/store/rootmulti/proof_test.go @@ -6,6 +6,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" "cosmossdk.io/store/iavl" diff --git a/store/rootmulti/snapshot_test.go b/store/rootmulti/snapshot_test.go index 9d32727f07ca..54be0c6d2de6 100644 --- a/store/rootmulti/snapshot_test.go +++ b/store/rootmulti/snapshot_test.go @@ -10,6 +10,7 @@ import ( "math/rand" "testing" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/store/rootmulti/store_test.go b/store/rootmulti/store_test.go index 29d728e1ffda..979f996eb54e 100644 --- a/store/rootmulti/store_test.go +++ b/store/rootmulti/store_test.go @@ -9,6 +9,7 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" "cosmossdk.io/store/cachemulti" diff --git a/store/snapshots/helpers_test.go b/store/snapshots/helpers_test.go index f2a65cab19a2..fb149df30baf 100644 --- a/store/snapshots/helpers_test.go +++ b/store/snapshots/helpers_test.go @@ -13,6 +13,7 @@ import ( "github.com/cometbft/cometbft/libs/log" db "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" protoio "github.com/cosmos/gogoproto/io" "github.com/stretchr/testify/require" diff --git a/store/types/iterator_test.go b/store/types/iterator_test.go index 40eefb148acb..92d717b37b3a 100644 --- a/store/types/iterator_test.go +++ b/store/types/iterator_test.go @@ -5,6 +5,7 @@ import ( "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" "cosmossdk.io/store/iavl" diff --git a/tests/go.mod b/tests/go.mod index 61b36988586f..1c6695c690db 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -61,6 +61,7 @@ require ( github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect diff --git a/tests/go.sum b/tests/go.sum index ae62ab8fafbb..a5daa5a1c086 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -196,6 +196,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/testutil/context.go b/testutil/context.go index e937e71a80d0..a30887a1cff9 100644 --- a/testutil/context.go +++ b/testutil/context.go @@ -6,6 +6,7 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/assert" "cosmossdk.io/store" diff --git a/testutil/network/network.go b/testutil/network/network.go index 9b729707cc6b..8f2768e5127f 100644 --- a/testutil/network/network.go +++ b/testutil/network/network.go @@ -22,6 +22,7 @@ import ( "github.com/cometbft/cometbft/node" tmclient "github.com/cometbft/cometbft/rpc/client" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/spf13/cobra" "google.golang.org/grpc" @@ -379,7 +380,7 @@ func New(l Logger, baseDir string, cfg Config) (*Network, error) { appCfg.GRPCWeb.Enable = true } - logger := tmlog.NewNopLogger() + logger := log.NewNopLogger() if cfg.EnableTMLogging { logger = tmlog.NewTMLogger(tmlog.NewSyncWriter(os.Stdout)) } diff --git a/testutil/sims/simulation_helpers_test.go b/testutil/sims/simulation_helpers_test.go index 2e267b9e2068..655a35f54e4a 100644 --- a/testutil/sims/simulation_helpers_test.go +++ b/testutil/sims/simulation_helpers_test.go @@ -11,6 +11,9 @@ import ( "cosmossdk.io/store/metrics" "cosmossdk.io/store/rootmulti" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" + "github.com/stretchr/testify/require" + "gotest.tools/v3/assert" "github.com/cosmos/cosmos-sdk/codec" diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index b04795207b59..2d21a743e409 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -182,6 +182,7 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/authz/module/abci_test.go b/x/authz/module/abci_test.go index 24f25f50e33c..90810829b122 100644 --- a/x/authz/module/abci_test.go +++ b/x/authz/module/abci_test.go @@ -5,6 +5,10 @@ import ( "time" storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/log" + "github.com/golang/mock/gomock" + "github.com/stretchr/testify/require" + "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/testutil" diff --git a/x/evidence/go.sum b/x/evidence/go.sum index 07f08070c7b1..9c6230fb13b3 100644 --- a/x/evidence/go.sum +++ b/x/evidence/go.sum @@ -176,6 +176,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/feegrant/go.sum b/x/feegrant/go.sum index ddc96970cb36..e1a443ef4f99 100644 --- a/x/feegrant/go.sum +++ b/x/feegrant/go.sum @@ -178,6 +178,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/genutil/client/cli/genaccount_test.go b/x/genutil/client/cli/genaccount_test.go index 1b73ff72e4f5..67e131103412 100644 --- a/x/genutil/client/cli/genaccount_test.go +++ b/x/genutil/client/cli/genaccount_test.go @@ -15,9 +15,11 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" + "github.com/cosmos/cosmos-sdk/crypto/hd" + "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/cosmos/cosmos-sdk/server" "github.com/cosmos/cosmos-sdk/testutil/testdata" - + sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/cosmos/cosmos-sdk/x/auth" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" diff --git a/x/nft/go.sum b/x/nft/go.sum index 07f08070c7b1..9c6230fb13b3 100644 --- a/x/nft/go.sum +++ b/x/nft/go.sum @@ -176,6 +176,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go index d7cf83d35088..5d27edf99bcc 100644 --- a/x/params/types/subspace_test.go +++ b/x/params/types/subspace_test.go @@ -9,6 +9,7 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/suite" "cosmossdk.io/depinject" diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index a0c25e572195..72466082a978 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -11,6 +11,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk v0.47.0-rc2 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 github.com/cosmos/gogoproto v1.4.4 github.com/golang/protobuf v1.5.2 github.com/grpc-ecosystem/grpc-gateway v1.16.0 diff --git a/x/upgrade/go.sum b/x/upgrade/go.sum index f1462e32d039..b232aa99105c 100644 --- a/x/upgrade/go.sum +++ b/x/upgrade/go.sum @@ -195,6 +195,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= From c2f6aa8d0d874207e9af23dcdc64833ff4747fca Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sat, 4 Feb 2023 00:12:35 +0100 Subject: [PATCH 02/14] remove more instances of tmlog --- baseapp/baseapp.go | 4 ++++ runtime/builder.go | 1 + server/api/server.go | 4 ++-- server/types/app.go | 8 ++++---- simapp/app.go | 2 ++ simapp/app_v2.go | 1 + simapp/simd/cmd/root.go | 2 ++ store/pruning/manager.go | 1 + store/rootmulti/store.go | 2 ++ store/snapshots/manager.go | 2 +- store/streaming/file/service.go | 4 ++-- tests/integration/store/rootmulti/rollback_test.go | 3 +++ types/context.go | 8 ++++---- types/mempool/sender_nonce_property_test.go | 2 ++ types/utils.go | 2 +- x/auth/keeper/keeper.go | 2 +- x/authz/keeper/genesis_test.go | 4 ++-- x/authz/keeper/keeper.go | 4 ++-- x/bank/keeper/view.go | 2 +- x/bank/migrations/v2/store.go | 2 +- x/bank/migrations/v3/store.go | 2 +- x/capability/keeper/keeper.go | 2 +- x/crisis/keeper/keeper.go | 2 +- x/distribution/keeper/keeper.go | 3 +-- x/evidence/keeper/keeper.go | 4 ++-- x/feegrant/keeper/keeper.go | 3 +-- x/gov/keeper/keeper.go | 3 +-- x/group/internal/orm/testsupport.go | 1 + x/group/keeper/invariants_test.go | 10 ++++------ x/mint/keeper/keeper.go | 2 +- x/params/keeper/keeper.go | 2 +- x/slashing/keeper/keeper.go | 2 +- x/staking/keeper/keeper.go | 4 ++-- 33 files changed, 57 insertions(+), 43 deletions(-) diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index a3bc422f63aa..eae9382aa80c 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -11,7 +11,11 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/proto" + abci "github.com/tendermint/tendermint/abci/types" + "github.com/tendermint/tendermint/crypto/tmhash" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "golang.org/x/exp/maps" "cosmossdk.io/store" diff --git a/runtime/builder.go b/runtime/builder.go index e214dbeed54c..ab6b55147401 100644 --- a/runtime/builder.go +++ b/runtime/builder.go @@ -6,6 +6,7 @@ import ( "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/server/api/server.go b/server/api/server.go index 9927574c6f11..0b27b5380a29 100644 --- a/server/api/server.go +++ b/server/api/server.go @@ -8,13 +8,13 @@ import ( "sync" "time" - "github.com/cometbft/cometbft/libs/log" - tmrpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" + "github.com/cosmos/cosmos-sdk/log" gateway "github.com/cosmos/gogogateway" "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/improbable-eng/grpc-web/go/grpcweb" + tmrpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" "google.golang.org/grpc" "github.com/cosmos/cosmos-sdk/client" diff --git a/server/types/app.go b/server/types/app.go index 44e5015ab4b6..ed5765b1ff4c 100644 --- a/server/types/app.go +++ b/server/types/app.go @@ -7,12 +7,12 @@ import ( dbm "github.com/cosmos/cosmos-db" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - tmtypes "github.com/cometbft/cometbft/types" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/grpc" "github.com/spf13/cobra" + abci "github.com/tendermint/tendermint/abci/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmtypes "github.com/tendermint/tendermint/types" storetypes "cosmossdk.io/store/types" diff --git a/simapp/app.go b/simapp/app.go index e74e6799099c..2cf86f2d84ef 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -15,7 +15,9 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/spf13/cast" + abci "github.com/tendermint/tendermint/abci/types" simappparams "cosmossdk.io/simapp/params" "cosmossdk.io/x/evidence" diff --git a/simapp/app_v2.go b/simapp/app_v2.go index 0b0b3d7c1b69..0448d09db6c7 100644 --- a/simapp/app_v2.go +++ b/simapp/app_v2.go @@ -10,6 +10,7 @@ import ( "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "cosmossdk.io/client/v2/autocli" "cosmossdk.io/depinject" diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index 06f98ed06a60..a82c58ff0620 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -8,8 +8,10 @@ import ( tmcfg "github.com/cometbft/cometbft/config" "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "github.com/spf13/cobra" "github.com/spf13/viper" + tmcfg "github.com/tendermint/tendermint/config" "cosmossdk.io/simapp" "cosmossdk.io/simapp/params" diff --git a/store/pruning/manager.go b/store/pruning/manager.go index 3a4aabaadc33..c14aadfd72ee 100644 --- a/store/pruning/manager.go +++ b/store/pruning/manager.go @@ -8,6 +8,7 @@ import ( "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "cosmossdk.io/store/pruning/types" ) diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index a1ee5619b6c1..a74aa42d7b5c 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -12,9 +12,11 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" protoio "github.com/cosmos/gogoproto/io" gogotypes "github.com/cosmos/gogoproto/types" iavltree "github.com/cosmos/iavl" + abci "github.com/tendermint/tendermint/abci/types" sdkerrors "cosmossdk.io/errors" "cosmossdk.io/store/cachemulti" diff --git a/store/snapshots/manager.go b/store/snapshots/manager.go index 842cab8d3918..c731ac8ada3b 100644 --- a/store/snapshots/manager.go +++ b/store/snapshots/manager.go @@ -11,7 +11,7 @@ import ( "sync" sdkerrors "cosmossdk.io/errors" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "cosmossdk.io/store/snapshots/types" storetypes "cosmossdk.io/store/types" diff --git a/store/streaming/file/service.go b/store/streaming/file/service.go index 2c7398571ff3..099fdae77397 100644 --- a/store/streaming/file/service.go +++ b/store/streaming/file/service.go @@ -11,8 +11,8 @@ import ( "sync" "cosmossdk.io/errors" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" + abci "github.com/tendermint/tendermint/abci/types" "cosmossdk.io/store/types" ) diff --git a/tests/integration/store/rootmulti/rollback_test.go b/tests/integration/store/rootmulti/rollback_test.go index 9034524ec7c6..55803947592d 100644 --- a/tests/integration/store/rootmulti/rollback_test.go +++ b/tests/integration/store/rootmulti/rollback_test.go @@ -9,6 +9,9 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" + abci "github.com/tendermint/tendermint/abci/types" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "gotest.tools/v3/assert" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" diff --git a/types/context.go b/types/context.go index f4fe78ad7c5e..7fb97c410d44 100644 --- a/types/context.go +++ b/types/context.go @@ -4,11 +4,11 @@ import ( "context" "time" - abci "github.com/cometbft/cometbft/abci/types" - tmbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/proto" + abci "github.com/tendermint/tendermint/abci/types" + tmbytes "github.com/tendermint/tendermint/libs/bytes" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "cosmossdk.io/store/gaskv" storetypes "cosmossdk.io/store/types" diff --git a/types/mempool/sender_nonce_property_test.go b/types/mempool/sender_nonce_property_test.go index 6930e6aa1a96..4e0e780632f8 100644 --- a/types/mempool/sender_nonce_property_test.go +++ b/types/mempool/sender_nonce_property_test.go @@ -8,10 +8,12 @@ import ( "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" + "github.com/cosmos/cosmos-sdk/log" sdk "github.com/cosmos/cosmos-sdk/types" mempool "github.com/cosmos/cosmos-sdk/types/mempool" "github.com/cosmos/cosmos-sdk/x/auth/signing" "github.com/stretchr/testify/require" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) var ( diff --git a/types/utils.go b/types/utils.go index 41132c92d899..af33f28bc943 100644 --- a/types/utils.go +++ b/types/utils.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - log "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/types/kv" ) diff --git a/x/auth/keeper/keeper.go b/x/auth/keeper/keeper.go index 6ce95f7778ef..4a115a89c1fc 100644 --- a/x/auth/keeper/keeper.go +++ b/x/auth/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" gogotypes "github.com/cosmos/gogoproto/types" storetypes "cosmossdk.io/store/types" diff --git a/x/authz/keeper/genesis_test.go b/x/authz/keeper/genesis_test.go index ddaa5fb07bab..cb3fc052ac85 100644 --- a/x/authz/keeper/genesis_test.go +++ b/x/authz/keeper/genesis_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/suite" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" storetypes "cosmossdk.io/store/types" "github.com/golang/mock/gomock" diff --git a/x/authz/keeper/keeper.go b/x/authz/keeper/keeper.go index b73153297bda..23bcd3a2c945 100644 --- a/x/authz/keeper/keeper.go +++ b/x/authz/keeper/keeper.go @@ -5,9 +5,9 @@ import ( "strconv" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/proto" + abci "github.com/tendermint/tendermint/abci/types" storetypes "cosmossdk.io/store/types" diff --git a/x/bank/keeper/view.go b/x/bank/keeper/view.go index b029ef70b3b7..8876dadd95e8 100644 --- a/x/bank/keeper/view.go +++ b/x/bank/keeper/view.go @@ -4,7 +4,7 @@ import ( "fmt" "cosmossdk.io/math" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" diff --git a/x/bank/migrations/v2/store.go b/x/bank/migrations/v2/store.go index 5b0d1af0661c..469c1e26cc94 100644 --- a/x/bank/migrations/v2/store.go +++ b/x/bank/migrations/v2/store.go @@ -4,7 +4,7 @@ import ( "cosmossdk.io/math" "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/bank/migrations/v3/store.go b/x/bank/migrations/v3/store.go index aca92994ee1c..b886675aab1c 100644 --- a/x/bank/migrations/v3/store.go +++ b/x/bank/migrations/v3/store.go @@ -3,7 +3,7 @@ package v3 import ( "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/capability/keeper/keeper.go b/x/capability/keeper/keeper.go index e891f3116806..ae58115948d9 100644 --- a/x/capability/keeper/keeper.go +++ b/x/capability/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" diff --git a/x/crisis/keeper/keeper.go b/x/crisis/keeper/keeper.go index b4288c15fbc8..b18839db287d 100644 --- a/x/crisis/keeper/keeper.go +++ b/x/crisis/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" storetypes "cosmossdk.io/store/types" diff --git a/x/distribution/keeper/keeper.go b/x/distribution/keeper/keeper.go index 26e45521f8e7..383f39cce497 100644 --- a/x/distribution/keeper/keeper.go +++ b/x/distribution/keeper/keeper.go @@ -3,9 +3,8 @@ package keeper import ( "fmt" - "github.com/cometbft/cometbft/libs/log" - storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/evidence/keeper/keeper.go b/x/evidence/keeper/keeper.go index f61a99499bd7..07084fd47288 100644 --- a/x/evidence/keeper/keeper.go +++ b/x/evidence/keeper/keeper.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/x/evidence/exported" "cosmossdk.io/x/evidence/types" - tmbytes "github.com/cometbft/cometbft/libs/bytes" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" + tmbytes "github.com/tendermint/tendermint/libs/bytes" "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" diff --git a/x/feegrant/keeper/keeper.go b/x/feegrant/keeper/keeper.go index eafcf52778e5..574ca6a33870 100644 --- a/x/feegrant/keeper/keeper.go +++ b/x/feegrant/keeper/keeper.go @@ -4,10 +4,9 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/log" - storetypes "cosmossdk.io/store/types" "cosmossdk.io/x/feegrant" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/gov/keeper/keeper.go b/x/gov/keeper/keeper.go index ade1c13969ec..16e2b83a8072 100644 --- a/x/gov/keeper/keeper.go +++ b/x/gov/keeper/keeper.go @@ -4,9 +4,8 @@ import ( "fmt" "time" - "github.com/cometbft/cometbft/libs/log" - storetypes "cosmossdk.io/store/types" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" diff --git a/x/group/internal/orm/testsupport.go b/x/group/internal/orm/testsupport.go index 9e4862586229..137f34a2c7a7 100644 --- a/x/group/internal/orm/testsupport.go +++ b/x/group/internal/orm/testsupport.go @@ -5,6 +5,7 @@ import ( "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" "cosmossdk.io/store" "cosmossdk.io/store/gaskv" diff --git a/x/group/keeper/invariants_test.go b/x/group/keeper/invariants_test.go index 7b190286b8f5..5d0b2e88623b 100644 --- a/x/group/keeper/invariants_test.go +++ b/x/group/keeper/invariants_test.go @@ -3,15 +3,13 @@ package keeper_test import ( "testing" - "github.com/cometbft/cometbft/libs/log" - "github.com/stretchr/testify/suite" - - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - dbm "github.com/cosmos/cosmos-db" - "cosmossdk.io/store" "cosmossdk.io/store/metrics" storetypes "cosmossdk.io/store/types" + dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" + "github.com/stretchr/testify/suite" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index b1a8684cc740..90baf0873312 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -4,7 +4,7 @@ import ( "fmt" "cosmossdk.io/math" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" storetypes "cosmossdk.io/store/types" diff --git a/x/params/keeper/keeper.go b/x/params/keeper/keeper.go index a75d6fd6d184..41fd26bebe2d 100644 --- a/x/params/keeper/keeper.go +++ b/x/params/keeper/keeper.go @@ -2,7 +2,7 @@ package keeper import ( storetypes "cosmossdk.io/store/types" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/slashing/keeper/keeper.go b/x/slashing/keeper/keeper.go index db05df2b5631..ba263cf6ebc7 100644 --- a/x/slashing/keeper/keeper.go +++ b/x/slashing/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "fmt" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" storetypes "cosmossdk.io/store/types" diff --git a/x/staking/keeper/keeper.go b/x/staking/keeper/keeper.go index 1b1e85a415c9..a54e67ab5c72 100644 --- a/x/staking/keeper/keeper.go +++ b/x/staking/keeper/keeper.go @@ -4,8 +4,8 @@ import ( "fmt" "cosmossdk.io/math" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" + "github.com/cosmos/cosmos-sdk/log" + abci "github.com/tendermint/tendermint/abci/types" storetypes "cosmossdk.io/store/types" From e912eb9feed8f7badf22dba4a77ee99c17f74dc5 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sat, 4 Feb 2023 14:47:22 +0100 Subject: [PATCH 03/14] fix go.mods --- simapp/go.mod | 3 +-- store/go.mod | 3 +-- store/go.sum | 7 +++++++ 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/simapp/go.mod b/simapp/go.mod index b1b099a8c74d..ed581ea3a6e7 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -19,6 +19,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 // this version is not used as it is always replaced by the latest cosmos-sdk version github.com/cosmos/cosmos-sdk v0.47.0-rc2 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 github.com/golang/mock v1.6.0 github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.6.1 @@ -28,8 +29,6 @@ require ( google.golang.org/protobuf v1.28.2-0.20230130093322-0430d694e04a ) -require github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 - require ( cloud.google.com/go v0.105.0 // indirect cloud.google.com/go/compute v1.14.0 // indirect diff --git a/store/go.mod b/store/go.mod index 46db69a9b1a6..95eeb422755b 100644 --- a/store/go.mod +++ b/store/go.mod @@ -9,6 +9,7 @@ require ( github.com/cometbft/cometbft v0.0.0-20230202201700-d159562d0d96 github.com/confio/ics23/go v0.9.0 github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 github.com/cosmos/gogoproto v1.4.4 github.com/cosmos/iavl v0.20.0-alpha3 github.com/golang/mock v1.6.0 @@ -24,8 +25,6 @@ require ( gotest.tools/v3 v3.4.0 ) -require github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 - require ( cosmossdk.io/api v0.2.6 // indirect cosmossdk.io/collections v0.0.0-20230202103518-eb86b68caea0 // indirect diff --git a/store/go.sum b/store/go.sum index 84cd2a9e76a9..85b14b1ddb1c 100644 --- a/store/go.sum +++ b/store/go.sum @@ -83,6 +83,13 @@ github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c h1:18vrPZBG4Zuh8A github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c/go.mod h1:NoM5UQkpKJY86c0Acb8Hy7HyNrltal8+BxQyerU8fzM= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +<<<<<<< HEAD +||||||| parent of d92fd24ba6 (fix go.mods) +>>>>>>> main +======= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= +>>>>>>> d92fd24ba6 (fix go.mods) github.com/cosmos/gogoproto v1.4.4 h1:nVAsgLlAf5jeN0fV7hRlkZvf768zU+dy4pG+hxc2P34= github.com/cosmos/gogoproto v1.4.4/go.mod h1:/yl6/nLwsZcZ2JY3OrqjRqvqCG9InUMcXRfRjQiF9DU= github.com/cosmos/iavl v0.20.0-alpha3 h1:hbUyr0dkiGDlmmbrArvte0lXv6VkMrGQNr3b29xvmVk= From 7f0472eb295f90267a94b2861c456ff9e7d4a2cb Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 16:02:11 +0100 Subject: [PATCH 04/14] build --- baseapp/baseapp.go | 4 ---- baseapp/baseapp_test.go | 10 ++-------- baseapp/block_gas_test.go | 1 - client/grpc_query_test.go | 1 - log/noop_logger.go | 2 +- runtime/builder.go | 1 - server/api/server.go | 2 +- server/types/app.go | 6 +++--- simapp/app.go | 2 -- simapp/app_v2.go | 1 - simapp/simd/cmd/root.go | 2 -- simapp/test_helpers.go | 1 - store/iavl/store_test.go | 1 - store/pruning/manager.go | 1 - store/pruning/manager_test.go | 1 - store/rootmulti/proof_test.go | 1 - store/rootmulti/snapshot_test.go | 1 - store/rootmulti/store.go | 2 -- store/rootmulti/store_test.go | 1 - store/snapshots/helpers_test.go | 1 - store/streaming/file/service.go | 2 +- store/types/iterator_test.go | 1 - tests/integration/store/rootmulti/rollback_test.go | 3 --- testutil/context.go | 1 - testutil/sims/simulation_helpers_test.go | 4 ---- types/context.go | 6 +++--- types/mempool/sender_nonce_property_test.go | 5 +---- x/authz/keeper/genesis_test.go | 2 +- x/authz/keeper/keeper.go | 2 +- x/authz/module/abci_test.go | 8 +------- x/evidence/keeper/keeper.go | 2 +- x/genutil/client/cli/genaccount_test.go | 4 ---- x/group/internal/orm/testsupport.go | 1 - x/group/keeper/invariants_test.go | 2 +- x/params/types/subspace_test.go | 1 - x/staking/keeper/keeper.go | 2 +- 36 files changed, 18 insertions(+), 70 deletions(-) diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index eae9382aa80c..e25dce758c67 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -8,14 +8,10 @@ import ( abci "github.com/cometbft/cometbft/abci/types" "github.com/cometbft/cometbft/crypto/tmhash" - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/proto" - abci "github.com/tendermint/tendermint/abci/types" - "github.com/tendermint/tendermint/crypto/tmhash" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "golang.org/x/exp/maps" "cosmossdk.io/store" diff --git a/baseapp/baseapp_test.go b/baseapp/baseapp_test.go index 24ab5e8735e6..29b5dac2fd25 100644 --- a/baseapp/baseapp_test.go +++ b/baseapp/baseapp_test.go @@ -6,23 +6,17 @@ import ( "testing" "time" - abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - dbm "github.com/cosmos/cosmos-db" - "github.com/stretchr/testify/require" - "cosmossdk.io/store/metrics" pruningtypes "cosmossdk.io/store/pruning/types" "cosmossdk.io/store/rootmulti" "cosmossdk.io/store/snapshots" snapshottypes "cosmossdk.io/store/snapshots/types" storetypes "cosmossdk.io/store/types" + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" baseapptestutil "github.com/cosmos/cosmos-sdk/baseapp/testutil" diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go index 448337942634..4c5801a4200c 100644 --- a/baseapp/block_gas_test.go +++ b/baseapp/block_gas_test.go @@ -9,7 +9,6 @@ import ( sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/client/grpc_query_test.go b/client/grpc_query_test.go index 82a144566d59..6413d80a7833 100644 --- a/client/grpc_query_test.go +++ b/client/grpc_query_test.go @@ -8,7 +8,6 @@ import ( sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/log/noop_logger.go b/log/noop_logger.go index de41f188a48a..0456de335d0a 100644 --- a/log/noop_logger.go +++ b/log/noop_logger.go @@ -14,6 +14,6 @@ func (l *NoOp) Debug(msg string, keyvals ...interface{}) {} func (l *NoOp) Info(msg string, keyvals ...interface{}) {} func (l *NoOp) Error(msg string, keyvals ...interface{}) {} -func (l NoOp) With(i ...interface{}) cmlog.Logger { +func (l *NoOp) With(i ...interface{}) cmlog.Logger { return l } diff --git a/runtime/builder.go b/runtime/builder.go index ab6b55147401..e32a0fd3b50b 100644 --- a/runtime/builder.go +++ b/runtime/builder.go @@ -4,7 +4,6 @@ import ( "encoding/json" "io" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/server/api/server.go b/server/api/server.go index 0b27b5380a29..c194aef2d281 100644 --- a/server/api/server.go +++ b/server/api/server.go @@ -8,13 +8,13 @@ import ( "sync" "time" + tmrpcserver "github.com/cometbft/cometbft/rpc/jsonrpc/server" "github.com/cosmos/cosmos-sdk/log" gateway "github.com/cosmos/gogogateway" "github.com/gorilla/handlers" "github.com/gorilla/mux" "github.com/grpc-ecosystem/grpc-gateway/runtime" "github.com/improbable-eng/grpc-web/go/grpcweb" - tmrpcserver "github.com/tendermint/tendermint/rpc/jsonrpc/server" "google.golang.org/grpc" "github.com/cosmos/cosmos-sdk/client" diff --git a/server/types/app.go b/server/types/app.go index ed5765b1ff4c..4b2389557ff4 100644 --- a/server/types/app.go +++ b/server/types/app.go @@ -7,12 +7,12 @@ import ( dbm "github.com/cosmos/cosmos-db" + abci "github.com/cometbft/cometbft/abci/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" + tmtypes "github.com/cometbft/cometbft/types" "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/grpc" "github.com/spf13/cobra" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtypes "github.com/tendermint/tendermint/types" storetypes "cosmossdk.io/store/types" diff --git a/simapp/app.go b/simapp/app.go index 2cf86f2d84ef..3f4071e1de27 100644 --- a/simapp/app.go +++ b/simapp/app.go @@ -13,11 +13,9 @@ import ( "cosmossdk.io/client/v2/autocli" "cosmossdk.io/core/appmodule" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/spf13/cast" - abci "github.com/tendermint/tendermint/abci/types" simappparams "cosmossdk.io/simapp/params" "cosmossdk.io/x/evidence" diff --git a/simapp/app_v2.go b/simapp/app_v2.go index 0448d09db6c7..193ce789a2a0 100644 --- a/simapp/app_v2.go +++ b/simapp/app_v2.go @@ -8,7 +8,6 @@ import ( "os" "path/filepath" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/simapp/simd/cmd/root.go b/simapp/simd/cmd/root.go index a82c58ff0620..9cf4596fcaf0 100644 --- a/simapp/simd/cmd/root.go +++ b/simapp/simd/cmd/root.go @@ -6,12 +6,10 @@ import ( "os" tmcfg "github.com/cometbft/cometbft/config" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/spf13/cobra" "github.com/spf13/viper" - tmcfg "github.com/tendermint/tendermint/config" "cosmossdk.io/simapp" "cosmossdk.io/simapp/params" diff --git a/simapp/test_helpers.go b/simapp/test_helpers.go index e678c9d5f725..36aa3fc07251 100644 --- a/simapp/test_helpers.go +++ b/simapp/test_helpers.go @@ -9,7 +9,6 @@ import ( sdkmath "cosmossdk.io/math" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" tmtypes "github.com/cometbft/cometbft/types" dbm "github.com/cosmos/cosmos-db" diff --git a/store/iavl/store_test.go b/store/iavl/store_test.go index a93449e9637d..fc91f960df69 100644 --- a/store/iavl/store_test.go +++ b/store/iavl/store_test.go @@ -6,7 +6,6 @@ import ( "testing" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/iavl" diff --git a/store/pruning/manager.go b/store/pruning/manager.go index c14aadfd72ee..de32c8176661 100644 --- a/store/pruning/manager.go +++ b/store/pruning/manager.go @@ -6,7 +6,6 @@ import ( "fmt" "sync" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/store/pruning/manager_test.go b/store/pruning/manager_test.go index 9a411d9928a6..feeb26c25af6 100644 --- a/store/pruning/manager_test.go +++ b/store/pruning/manager_test.go @@ -6,7 +6,6 @@ import ( "fmt" "testing" - "github.com/cometbft/cometbft/libs/log" db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/golang/mock/gomock" diff --git a/store/rootmulti/proof_test.go b/store/rootmulti/proof_test.go index c7898f9e8464..b8ec29329560 100644 --- a/store/rootmulti/proof_test.go +++ b/store/rootmulti/proof_test.go @@ -4,7 +4,6 @@ import ( "testing" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" diff --git a/store/rootmulti/snapshot_test.go b/store/rootmulti/snapshot_test.go index 54be0c6d2de6..d51b38c50c02 100644 --- a/store/rootmulti/snapshot_test.go +++ b/store/rootmulti/snapshot_test.go @@ -20,7 +20,6 @@ import ( "cosmossdk.io/store/snapshots" snapshottypes "cosmossdk.io/store/snapshots/types" "cosmossdk.io/store/types" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" ) diff --git a/store/rootmulti/store.go b/store/rootmulti/store.go index a74aa42d7b5c..055e6da65225 100644 --- a/store/rootmulti/store.go +++ b/store/rootmulti/store.go @@ -10,13 +10,11 @@ import ( "sync" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" protoio "github.com/cosmos/gogoproto/io" gogotypes "github.com/cosmos/gogoproto/types" iavltree "github.com/cosmos/iavl" - abci "github.com/tendermint/tendermint/abci/types" sdkerrors "cosmossdk.io/errors" "cosmossdk.io/store/cachemulti" diff --git a/store/rootmulti/store_test.go b/store/rootmulti/store_test.go index 979f996eb54e..59b9565bc21e 100644 --- a/store/rootmulti/store_test.go +++ b/store/rootmulti/store_test.go @@ -7,7 +7,6 @@ import ( "time" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" diff --git a/store/snapshots/helpers_test.go b/store/snapshots/helpers_test.go index fb149df30baf..1992a2f08417 100644 --- a/store/snapshots/helpers_test.go +++ b/store/snapshots/helpers_test.go @@ -11,7 +11,6 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/libs/log" db "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" protoio "github.com/cosmos/gogoproto/io" diff --git a/store/streaming/file/service.go b/store/streaming/file/service.go index 099fdae77397..09b76f2093dc 100644 --- a/store/streaming/file/service.go +++ b/store/streaming/file/service.go @@ -11,8 +11,8 @@ import ( "sync" "cosmossdk.io/errors" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/log" - abci "github.com/tendermint/tendermint/abci/types" "cosmossdk.io/store/types" ) diff --git a/store/types/iterator_test.go b/store/types/iterator_test.go index 92d717b37b3a..44200b2b0a8a 100644 --- a/store/types/iterator_test.go +++ b/store/types/iterator_test.go @@ -3,7 +3,6 @@ package types_test import ( "testing" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/require" diff --git a/tests/integration/store/rootmulti/rollback_test.go b/tests/integration/store/rootmulti/rollback_test.go index 55803947592d..166709584c5f 100644 --- a/tests/integration/store/rootmulti/rollback_test.go +++ b/tests/integration/store/rootmulti/rollback_test.go @@ -6,12 +6,9 @@ import ( "cosmossdk.io/simapp" abci "github.com/cometbft/cometbft/abci/types" - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" - abci "github.com/tendermint/tendermint/abci/types" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "gotest.tools/v3/assert" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" diff --git a/testutil/context.go b/testutil/context.go index a30887a1cff9..ed2e2b730554 100644 --- a/testutil/context.go +++ b/testutil/context.go @@ -3,7 +3,6 @@ package testutil import ( "testing" - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/testutil/sims/simulation_helpers_test.go b/testutil/sims/simulation_helpers_test.go index 655a35f54e4a..d7f7be2c5932 100644 --- a/testutil/sims/simulation_helpers_test.go +++ b/testutil/sims/simulation_helpers_test.go @@ -4,10 +4,6 @@ import ( "fmt" "testing" - "github.com/cometbft/cometbft/libs/log" - "github.com/stretchr/testify/require" - "gotest.tools/v3/assert" - "cosmossdk.io/store/metrics" "cosmossdk.io/store/rootmulti" dbm "github.com/cosmos/cosmos-db" diff --git a/types/context.go b/types/context.go index 7fb97c410d44..1b7c42bfce5b 100644 --- a/types/context.go +++ b/types/context.go @@ -4,11 +4,11 @@ import ( "context" "time" + abci "github.com/cometbft/cometbft/abci/types" + tmbytes "github.com/cometbft/cometbft/libs/bytes" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/proto" - abci "github.com/tendermint/tendermint/abci/types" - tmbytes "github.com/tendermint/tendermint/libs/bytes" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "cosmossdk.io/store/gaskv" storetypes "cosmossdk.io/store/types" diff --git a/types/mempool/sender_nonce_property_test.go b/types/mempool/sender_nonce_property_test.go index 4e0e780632f8..acf581afabd6 100644 --- a/types/mempool/sender_nonce_property_test.go +++ b/types/mempool/sender_nonce_property_test.go @@ -3,9 +3,6 @@ package mempool_test import ( "sort" - "pgregory.net/rapid" - - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/log" @@ -13,7 +10,7 @@ import ( mempool "github.com/cosmos/cosmos-sdk/types/mempool" "github.com/cosmos/cosmos-sdk/x/auth/signing" "github.com/stretchr/testify/require" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + "pgregory.net/rapid" ) var ( diff --git a/x/authz/keeper/genesis_test.go b/x/authz/keeper/genesis_test.go index cb3fc052ac85..74eda4c94b65 100644 --- a/x/authz/keeper/genesis_test.go +++ b/x/authz/keeper/genesis_test.go @@ -4,9 +4,9 @@ import ( "testing" "time" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" storetypes "cosmossdk.io/store/types" "github.com/golang/mock/gomock" diff --git a/x/authz/keeper/keeper.go b/x/authz/keeper/keeper.go index 23bcd3a2c945..91a3d40837e6 100644 --- a/x/authz/keeper/keeper.go +++ b/x/authz/keeper/keeper.go @@ -5,9 +5,9 @@ import ( "strconv" "time" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/log" "github.com/cosmos/gogoproto/proto" - abci "github.com/tendermint/tendermint/abci/types" storetypes "cosmossdk.io/store/types" diff --git a/x/authz/module/abci_test.go b/x/authz/module/abci_test.go index 90810829b122..2a62c7f8a534 100644 --- a/x/authz/module/abci_test.go +++ b/x/authz/module/abci_test.go @@ -5,10 +5,10 @@ import ( "time" storetypes "cosmossdk.io/store/types" + "github.com/cometbft/cometbft/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/log" "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/testutil" @@ -21,12 +21,6 @@ import ( authzmodule "github.com/cosmos/cosmos-sdk/x/authz/module" authztestutil "github.com/cosmos/cosmos-sdk/x/authz/testutil" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - - "github.com/golang/mock/gomock" - "github.com/stretchr/testify/require" - - "github.com/cometbft/cometbft/libs/log" - "github.com/cometbft/cometbft/proto/tendermint/types" ) func TestExpiredGrantsQueue(t *testing.T) { diff --git a/x/evidence/keeper/keeper.go b/x/evidence/keeper/keeper.go index 07084fd47288..6f8485fac581 100644 --- a/x/evidence/keeper/keeper.go +++ b/x/evidence/keeper/keeper.go @@ -5,8 +5,8 @@ import ( "cosmossdk.io/x/evidence/exported" "cosmossdk.io/x/evidence/types" + tmbytes "github.com/cometbft/cometbft/libs/bytes" "github.com/cosmos/cosmos-sdk/log" - tmbytes "github.com/tendermint/tendermint/libs/bytes" "cosmossdk.io/store/prefix" storetypes "cosmossdk.io/store/types" diff --git a/x/genutil/client/cli/genaccount_test.go b/x/genutil/client/cli/genaccount_test.go index 67e131103412..0ddeea03ee2a 100644 --- a/x/genutil/client/cli/genaccount_test.go +++ b/x/genutil/client/cli/genaccount_test.go @@ -5,10 +5,6 @@ import ( "fmt" "testing" - "github.com/cosmos/cosmos-sdk/crypto/hd" - "github.com/cosmos/cosmos-sdk/crypto/keyring" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cometbft/cometbft/libs/log" "github.com/spf13/viper" "github.com/stretchr/testify/require" diff --git a/x/group/internal/orm/testsupport.go b/x/group/internal/orm/testsupport.go index 137f34a2c7a7..1c4480ec6f81 100644 --- a/x/group/internal/orm/testsupport.go +++ b/x/group/internal/orm/testsupport.go @@ -3,7 +3,6 @@ package orm import ( "fmt" - "github.com/cometbft/cometbft/libs/log" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/x/group/keeper/invariants_test.go b/x/group/keeper/invariants_test.go index 5d0b2e88623b..f88f9ed30af1 100644 --- a/x/group/keeper/invariants_test.go +++ b/x/group/keeper/invariants_test.go @@ -6,10 +6,10 @@ import ( "cosmossdk.io/store" "cosmossdk.io/store/metrics" storetypes "cosmossdk.io/store/types" + tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/params/types/subspace_test.go b/x/params/types/subspace_test.go index 5d27edf99bcc..70ed1b0c4941 100644 --- a/x/params/types/subspace_test.go +++ b/x/params/types/subspace_test.go @@ -6,7 +6,6 @@ import ( "testing" "time" - "github.com/cometbft/cometbft/libs/log" tmproto "github.com/cometbft/cometbft/proto/tendermint/types" dbm "github.com/cosmos/cosmos-db" "github.com/cosmos/cosmos-sdk/log" diff --git a/x/staking/keeper/keeper.go b/x/staking/keeper/keeper.go index a54e67ab5c72..d1a8673b8a8c 100644 --- a/x/staking/keeper/keeper.go +++ b/x/staking/keeper/keeper.go @@ -4,8 +4,8 @@ import ( "fmt" "cosmossdk.io/math" + abci "github.com/cometbft/cometbft/abci/types" "github.com/cosmos/cosmos-sdk/log" - abci "github.com/tendermint/tendermint/abci/types" storetypes "cosmossdk.io/store/types" From 23ddc91807188e8fadb8cfe2e848e60d2ec5e3c7 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 16:45:24 +0100 Subject: [PATCH 05/14] test build --- go.mod | 2 ++ go.sum | 2 -- simapp/go.mod | 1 + simapp/go.sum | 2 -- store/go.mod | 4 +++- store/go.sum | 7 ------- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 9d991618715b..c7b6944feb40 100644 --- a/go.mod +++ b/go.mod @@ -157,6 +157,8 @@ replace github.com/cometbft/cometbft => github.com/cometbft/cometbft v0.0.0-2023 replace ( // use cosmos fork of keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 + + github.com/cosmos/cosmos-sdk/log => ./log // dgrijalva/jwt-go is deprecated and doesn't receive security updates. // TODO: remove it: https://github.com/cosmos/cosmos-sdk/issues/13134 github.com/dgrijalva/jwt-go => github.com/golang-jwt/jwt/v4 v4.4.2 diff --git a/go.sum b/go.sum index 4def95249ada..942bab200c6b 100644 --- a/go.sum +++ b/go.sum @@ -179,8 +179,6 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a h1:2humuGPw3O5riJVFq/E2FRjF57UrO97W1qJcGVmK+6k= github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a/go.mod h1:c8IO23vgNxueCCJlSI9awQtcxsvc+buzaeThB85qfBU= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/simapp/go.mod b/simapp/go.mod index ed581ea3a6e7..a8c0ae361441 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -206,6 +206,7 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Simapp always use the latest version of the cosmos-sdk github.com/cosmos/cosmos-sdk => ../. + github.com/cosmos/cosmos-sdk/log => ../log // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 diff --git a/simapp/go.sum b/simapp/go.sum index e8945b308802..cb70aeb345c9 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -201,8 +201,6 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/store/go.mod b/store/go.mod index 95eeb422755b..62afdcb1ab5f 100644 --- a/store/go.mod +++ b/store/go.mod @@ -6,7 +6,7 @@ require ( cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/math v1.0.0-beta.5 github.com/armon/go-metrics v0.4.1 - github.com/cometbft/cometbft v0.0.0-20230202201700-d159562d0d96 + github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d github.com/confio/ics23/go v0.9.0 github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 @@ -72,6 +72,8 @@ require ( // TODO update/remove after v0.37.x tag of CometBFT replace github.com/cometbft/cometbft => github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d +replace github.com/cosmos/cosmos-sdk/log => ../log + // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 diff --git a/store/go.sum b/store/go.sum index 85b14b1ddb1c..84cd2a9e76a9 100644 --- a/store/go.sum +++ b/store/go.sum @@ -83,13 +83,6 @@ github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c h1:18vrPZBG4Zuh8A github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c/go.mod h1:NoM5UQkpKJY86c0Acb8Hy7HyNrltal8+BxQyerU8fzM= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -<<<<<<< HEAD -||||||| parent of d92fd24ba6 (fix go.mods) ->>>>>>> main -======= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= ->>>>>>> d92fd24ba6 (fix go.mods) github.com/cosmos/gogoproto v1.4.4 h1:nVAsgLlAf5jeN0fV7hRlkZvf768zU+dy4pG+hxc2P34= github.com/cosmos/gogoproto v1.4.4/go.mod h1:/yl6/nLwsZcZ2JY3OrqjRqvqCG9InUMcXRfRjQiF9DU= github.com/cosmos/iavl v0.20.0-alpha3 h1:hbUyr0dkiGDlmmbrArvte0lXv6VkMrGQNr3b29xvmVk= From 9212d2ebe3505302fc4244acdbff67076eada3e5 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 16:50:50 +0100 Subject: [PATCH 06/14] tes build --- client/v2/go.mod | 1 + client/v2/go.sum | 2 ++ tests/go.mod | 3 ++- tools/confix/go.mod | 1 + tools/confix/go.sum | 2 ++ tools/cosmovisor/go.mod | 1 + tools/cosmovisor/go.sum | 1 + tools/hubl/go.mod | 1 + tools/hubl/go.sum | 2 ++ tools/rosetta/go.mod | 1 + tools/rosetta/go.sum | 2 ++ x/circuit/go.mod | 1 + x/circuit/go.sum | 2 ++ x/evidence/go.mod | 1 + x/feegrant/go.mod | 1 + x/nft/go.mod | 1 + x/upgrade/go.mod | 2 +- 17 files changed, 23 insertions(+), 2 deletions(-) diff --git a/client/v2/go.mod b/client/v2/go.mod index a79ac4b7219e..05660738d44b 100644 --- a/client/v2/go.mod +++ b/client/v2/go.mod @@ -38,6 +38,7 @@ require ( github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogoproto v1.4.4 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect diff --git a/client/v2/go.sum b/client/v2/go.sum index 9e1232906fb3..d63c8f577c0a 100644 --- a/client/v2/go.sum +++ b/client/v2/go.sum @@ -134,6 +134,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/tests/go.mod b/tests/go.mod index 1c6695c690db..ee7dfc255d42 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -26,6 +26,8 @@ require ( pgregory.net/rapid v0.5.5 ) +require github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + require ( cloud.google.com/go v0.105.0 // indirect cloud.google.com/go/compute v1.14.0 // indirect @@ -61,7 +63,6 @@ require ( github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect diff --git a/tools/confix/go.mod b/tools/confix/go.mod index ec9b58e42d00..039cf6477bd8 100644 --- a/tools/confix/go.mod +++ b/tools/confix/go.mod @@ -43,6 +43,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.4.4 // indirect diff --git a/tools/confix/go.sum b/tools/confix/go.sum index d6a8ccc8209b..ccf51bda1906 100644 --- a/tools/confix/go.sum +++ b/tools/confix/go.sum @@ -176,6 +176,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 9bbd8e12d39e..0bde11b23ff7 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -46,6 +46,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect github.com/cosmos/cosmos-sdk v0.47.0-rc2 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.4.4 // indirect diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index 2d21a743e409..a31b957a5059 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -183,6 +183,7 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnC github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/tools/hubl/go.mod b/tools/hubl/go.mod index d4ccf18ba1a5..b17d370b3921 100644 --- a/tools/hubl/go.mod +++ b/tools/hubl/go.mod @@ -42,6 +42,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect github.com/cosmos/cosmos-sdk v0.47.0-rc2 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogoproto v1.4.4 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect diff --git a/tools/hubl/go.sum b/tools/hubl/go.sum index 38c7685f3b11..810b9c986fad 100644 --- a/tools/hubl/go.sum +++ b/tools/hubl/go.sum @@ -139,6 +139,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index ecdebcc03031..b6ba38435e7a 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -42,6 +42,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.4.4 // indirect diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index f825595ba25b..2db4919a0d07 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -168,6 +168,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/circuit/go.mod b/x/circuit/go.mod index ee7122be63fd..93d807a9f4bd 100644 --- a/x/circuit/go.mod +++ b/x/circuit/go.mod @@ -34,6 +34,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cucumber/common/gherkin/go/v22 v22.0.0 // indirect github.com/cucumber/common/messages/go/v17 v17.1.1 // indirect github.com/davecgh/go-spew v1.1.1 // indirect diff --git a/x/circuit/go.sum b/x/circuit/go.sum index 5022d154bc7c..3d676d827497 100644 --- a/x/circuit/go.sum +++ b/x/circuit/go.sum @@ -131,6 +131,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/gogogateway v1.2.0 h1:Ae/OivNhp8DqBi/sh2A8a1D0y638GpL3tkmLQAiKxTE= github.com/cosmos/gogoproto v1.4.4 h1:nVAsgLlAf5jeN0fV7hRlkZvf768zU+dy4pG+hxc2P34= diff --git a/x/evidence/go.mod b/x/evidence/go.mod index 67723bff4779..d682522028e2 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -11,6 +11,7 @@ require ( github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk v0.47.0-rc2 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 github.com/cosmos/gogoproto v1.4.4 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index 54b45fa4bb06..0091bb686f98 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -11,6 +11,7 @@ require ( github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk v0.47.0-rc2 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 github.com/cosmos/gogoproto v1.4.4 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 diff --git a/x/nft/go.mod b/x/nft/go.mod index 87894e1acf5b..14c808082fb8 100644 --- a/x/nft/go.mod +++ b/x/nft/go.mod @@ -45,6 +45,7 @@ require ( github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index 72466082a978..ae35f3d29c05 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -11,7 +11,6 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk v0.47.0-rc2 - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 github.com/cosmos/gogoproto v1.4.4 github.com/golang/protobuf v1.5.2 github.com/grpc-ecosystem/grpc-gateway v1.16.0 @@ -57,6 +56,7 @@ require ( github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect From a4539a4ee547bbb329c1279fbffce46f0257c68a Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 21:21:51 +0100 Subject: [PATCH 07/14] build --- tools/cosmovisor/go.mod | 1 + tools/cosmovisor/go.sum | 2 -- tools/rosetta/go.mod | 2 ++ tools/rosetta/go.sum | 2 -- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 0bde11b23ff7..4dc32a81154d 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -161,4 +161,5 @@ require ( replace ( cosmossdk.io/x/upgrade => ../../x/upgrade github.com/cosmos/cosmos-sdk => ../.. + github.com/cosmos/cosmos-sdk/log => ../../log ) diff --git a/tools/cosmovisor/go.sum b/tools/cosmovisor/go.sum index a31b957a5059..b04795207b59 100644 --- a/tools/cosmovisor/go.sum +++ b/tools/cosmovisor/go.sum @@ -182,8 +182,6 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index b6ba38435e7a..0ef6f6fe7a11 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -136,3 +136,5 @@ require ( // This can be deleted after the CometBFT PR is merged replace github.com/cosmos/cosmos-sdk => ../.. + +replace github.com/cosmos/cosmos-sdk/log => ../../log diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index 2db4919a0d07..f825595ba25b 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -168,8 +168,6 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= -github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= From c85aaffc62aadda22581d8631525bc097b073ee3 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 21:34:33 +0100 Subject: [PATCH 08/14] go get --- store/go.mod | 2 +- tests/go.mod | 3 +-- tests/go.sum | 2 ++ x/evidence/go.mod | 2 +- x/evidence/go.sum | 2 ++ x/feegrant/go.mod | 2 +- x/feegrant/go.sum | 2 ++ x/nft/go.mod | 2 +- x/nft/go.sum | 2 ++ x/upgrade/go.mod | 2 +- x/upgrade/go.sum | 2 ++ 11 files changed, 16 insertions(+), 7 deletions(-) diff --git a/store/go.mod b/store/go.mod index 62afdcb1ab5f..b471356996d9 100644 --- a/store/go.mod +++ b/store/go.mod @@ -9,7 +9,7 @@ require ( github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d github.com/confio/ics23/go v0.9.0 github.com/cosmos/cosmos-db v0.0.0-20230119180254-161cf3632b7c - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 github.com/cosmos/gogoproto v1.4.4 github.com/cosmos/iavl v0.20.0-alpha3 github.com/golang/mock v1.6.0 diff --git a/tests/go.mod b/tests/go.mod index ee7dfc255d42..c181f3db8f83 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -24,10 +24,9 @@ require ( google.golang.org/protobuf v1.28.2-0.20230130093322-0430d694e04a gotest.tools/v3 v3.4.0 pgregory.net/rapid v0.5.5 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 ) -require github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 - require ( cloud.google.com/go v0.105.0 // indirect cloud.google.com/go/compute v1.14.0 // indirect diff --git a/tests/go.sum b/tests/go.sum index a5daa5a1c086..d5327faa60f6 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -198,6 +198,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 h1:uQ+4h0/3HcsVRfGgFK34VRBbHrO73IzLY4I+Y4aHsxQ= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547/go.mod h1:m+accZld6CCLhrrEScCJDbCizHJMdu7HZPQVYggEE3A= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/evidence/go.mod b/x/evidence/go.mod index d682522028e2..96a21551b843 100644 --- a/x/evidence/go.mod +++ b/x/evidence/go.mod @@ -11,7 +11,7 @@ require ( github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk v0.47.0-rc2 - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 github.com/cosmos/gogoproto v1.4.4 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 diff --git a/x/evidence/go.sum b/x/evidence/go.sum index 9c6230fb13b3..afef2785939d 100644 --- a/x/evidence/go.sum +++ b/x/evidence/go.sum @@ -178,6 +178,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 h1:uQ+4h0/3HcsVRfGgFK34VRBbHrO73IzLY4I+Y4aHsxQ= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547/go.mod h1:m+accZld6CCLhrrEScCJDbCizHJMdu7HZPQVYggEE3A= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/feegrant/go.mod b/x/feegrant/go.mod index 0091bb686f98..6e325bea1042 100644 --- a/x/feegrant/go.mod +++ b/x/feegrant/go.mod @@ -11,7 +11,7 @@ require ( github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk v0.47.0-rc2 - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 github.com/cosmos/gogoproto v1.4.4 github.com/golang/mock v1.6.0 github.com/golang/protobuf v1.5.2 diff --git a/x/feegrant/go.sum b/x/feegrant/go.sum index e1a443ef4f99..6cc47fc500bd 100644 --- a/x/feegrant/go.sum +++ b/x/feegrant/go.sum @@ -180,6 +180,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 h1:uQ+4h0/3HcsVRfGgFK34VRBbHrO73IzLY4I+Y4aHsxQ= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547/go.mod h1:m+accZld6CCLhrrEScCJDbCizHJMdu7HZPQVYggEE3A= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/nft/go.mod b/x/nft/go.mod index 14c808082fb8..5a27feb06b2f 100644 --- a/x/nft/go.mod +++ b/x/nft/go.mod @@ -45,7 +45,7 @@ require ( github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect diff --git a/x/nft/go.sum b/x/nft/go.sum index 9c6230fb13b3..afef2785939d 100644 --- a/x/nft/go.sum +++ b/x/nft/go.sum @@ -178,6 +178,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 h1:uQ+4h0/3HcsVRfGgFK34VRBbHrO73IzLY4I+Y4aHsxQ= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547/go.mod h1:m+accZld6CCLhrrEScCJDbCizHJMdu7HZPQVYggEE3A= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/x/upgrade/go.mod b/x/upgrade/go.mod index ae35f3d29c05..dd8cabda3f3a 100644 --- a/x/upgrade/go.mod +++ b/x/upgrade/go.mod @@ -56,7 +56,7 @@ require ( github.com/cometbft/cometbft-db v0.7.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0-alpha3 // indirect diff --git a/x/upgrade/go.sum b/x/upgrade/go.sum index b232aa99105c..76149f667849 100644 --- a/x/upgrade/go.sum +++ b/x/upgrade/go.sum @@ -197,6 +197,8 @@ github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbSh github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 h1:w/pmi2E+KaWm0n/XMFK42w+bxKVh90MQforxrEsVRhE= github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1/go.mod h1:KeFt2fAXe+xLWpJ/8KeGI6JtHzpA7jVMQN1dIfi5SgY= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 h1:uQ+4h0/3HcsVRfGgFK34VRBbHrO73IzLY4I+Y4aHsxQ= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547/go.mod h1:m+accZld6CCLhrrEScCJDbCizHJMdu7HZPQVYggEE3A= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= From 8ef2cbcdd9e74f81e3495d55e321fe5e61245c9c Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 21:42:26 +0100 Subject: [PATCH 09/14] try --- go.mod | 2 +- simapp/go.mod | 3 +-- simapp/go.sum | 2 ++ store/go.mod | 2 -- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index c7b6944feb40..6f675cf14a87 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 github.com/cosmos/cosmos-proto v1.0.0-beta.1 github.com/cosmos/cosmos-sdk/db v1.0.0-beta.1.0.20220726092710-f848e4300a8a - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 github.com/cosmos/go-bip39 v1.0.0 github.com/cosmos/gogogateway v1.2.0 github.com/cosmos/gogoproto v1.4.4 diff --git a/simapp/go.mod b/simapp/go.mod index a8c0ae361441..f0cbc075cd68 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -19,7 +19,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 // this version is not used as it is always replaced by the latest cosmos-sdk version github.com/cosmos/cosmos-sdk v0.47.0-rc2 - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 github.com/golang/mock v1.6.0 github.com/spf13/cast v1.5.0 github.com/spf13/cobra v1.6.1 @@ -206,7 +206,6 @@ replace ( github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // Simapp always use the latest version of the cosmos-sdk github.com/cosmos/cosmos-sdk => ../. - github.com/cosmos/cosmos-sdk/log => ../log // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 diff --git a/simapp/go.sum b/simapp/go.sum index cb70aeb345c9..213fe1ff2fe5 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -201,6 +201,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 h1:uQ+4h0/3HcsVRfGgFK34VRBbHrO73IzLY4I+Y4aHsxQ= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547/go.mod h1:m+accZld6CCLhrrEScCJDbCizHJMdu7HZPQVYggEE3A= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= diff --git a/store/go.mod b/store/go.mod index b471356996d9..2d8a6cce2da5 100644 --- a/store/go.mod +++ b/store/go.mod @@ -72,8 +72,6 @@ require ( // TODO update/remove after v0.37.x tag of CometBFT replace github.com/cometbft/cometbft => github.com/cometbft/cometbft v0.0.0-20230203130311-387422ac220d -replace github.com/cosmos/cosmos-sdk/log => ../log - // Fix upstream GHSA-h395-qcrw-5vmq vulnerability. // TODO Remove it: https://github.com/cosmos/cosmos-sdk/issues/10409 replace github.com/gin-gonic/gin => github.com/gin-gonic/gin v1.8.1 From dd58e12a74ceb7d1245b4d7ae2c6231b42b54ef1 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Sun, 5 Feb 2023 21:53:46 +0100 Subject: [PATCH 10/14] try --- tools/cosmovisor/go.mod | 3 +-- tools/rosetta/go.mod | 4 +--- tools/rosetta/go.sum | 2 ++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/cosmovisor/go.mod b/tools/cosmovisor/go.mod index 4dc32a81154d..b4d053698781 100644 --- a/tools/cosmovisor/go.mod +++ b/tools/cosmovisor/go.mod @@ -46,7 +46,7 @@ require ( github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect github.com/cosmos/cosmos-sdk v0.47.0-rc2 // indirect - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.4.4 // indirect @@ -161,5 +161,4 @@ require ( replace ( cosmossdk.io/x/upgrade => ../../x/upgrade github.com/cosmos/cosmos-sdk => ../.. - github.com/cosmos/cosmos-sdk/log => ../../log ) diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index 0ef6f6fe7a11..fec1a85630d1 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -42,7 +42,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-db v1.0.0-rc.1 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.1 // indirect - github.com/cosmos/cosmos-sdk/log v0.0.0-20230203122834-2c67b11220f1 // indirect + github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/gogoproto v1.4.4 // indirect @@ -136,5 +136,3 @@ require ( // This can be deleted after the CometBFT PR is merged replace github.com/cosmos/cosmos-sdk => ../.. - -replace github.com/cosmos/cosmos-sdk/log => ../../log diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index f825595ba25b..9ad8a59b47df 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -168,6 +168,8 @@ github.com/cosmos/cosmos-db v1.0.0-rc.1 h1:SjnT8B6WKMW9WEIX32qMhnEEKcI7ZP0+G1Sa9 github.com/cosmos/cosmos-db v1.0.0-rc.1/go.mod h1:Dnmk3flSf5lkwCqvvjNpoxjpXzhxnCAFzKHlbaForso= github.com/cosmos/cosmos-proto v1.0.0-beta.1 h1:iDL5qh++NoXxG8hSy93FdYJut4XfgbShIocllGaXx/0= github.com/cosmos/cosmos-proto v1.0.0-beta.1/go.mod h1:8k2GNZghi5sDRFw/scPL8gMSowT1vDA+5ouxL8GjaUE= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547 h1:uQ+4h0/3HcsVRfGgFK34VRBbHrO73IzLY4I+Y4aHsxQ= +github.com/cosmos/cosmos-sdk/log v0.0.0-20230205202151-a4539a4ee547/go.mod h1:m+accZld6CCLhrrEScCJDbCizHJMdu7HZPQVYggEE3A= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= From eafda37fad7b805b4935de4ccc609cc747d76d6b Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 6 Feb 2023 12:07:56 +0100 Subject: [PATCH 11/14] change noplogger from pointer to non --- log/noop_logger.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/log/noop_logger.go b/log/noop_logger.go index 0456de335d0a..a1ffb0a8334a 100644 --- a/log/noop_logger.go +++ b/log/noop_logger.go @@ -2,7 +2,7 @@ package log import cmlog "github.com/cometbft/cometbft/libs/log" -var _ Logger = &NoOp{} +var _ Logger = NoOp{} type NoOp struct{} @@ -10,10 +10,10 @@ func NewNopLogger() Logger { return &NoOp{} } -func (l *NoOp) Debug(msg string, keyvals ...interface{}) {} -func (l *NoOp) Info(msg string, keyvals ...interface{}) {} -func (l *NoOp) Error(msg string, keyvals ...interface{}) {} +func (l NoOp) Debug(msg string, keyvals ...interface{}) {} +func (l NoOp) Info(msg string, keyvals ...interface{}) {} +func (l NoOp) Error(msg string, keyvals ...interface{}) {} -func (l *NoOp) With(i ...interface{}) cmlog.Logger { +func (l NoOp) With(i ...interface{}) cmlog.Logger { return l } From 39b827a3ba541c43d124132648fd8b9b35043d5d Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 6 Feb 2023 23:27:50 -0500 Subject: [PATCH 12/14] update docker files --- contrib/images/simd-dlv/Dockerfile | 1 + contrib/images/simd-env/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/images/simd-dlv/Dockerfile b/contrib/images/simd-dlv/Dockerfile index 0fbf1698bd31..02df29c58410 100644 --- a/contrib/images/simd-dlv/Dockerfile +++ b/contrib/images/simd-dlv/Dockerfile @@ -13,6 +13,7 @@ COPY depinject/go.mod depinject/go.sum /work/depinject/ COPY tools/rosetta/go.mod tools/rosetta/go.sum /work/tools/rosetta/ COPY collections/go.mod collections/go.sum /work/collections/ COPY store/go.mod store/go.sum /work/store/ +COPY log/go.mod log/go.sum /work/log/ RUN go mod download COPY ./ /work diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index f5f3fe37e436..3d8471aa922c 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -12,6 +12,7 @@ COPY depinject/go.mod depinject/go.sum /work/depinject/ COPY tools/rosetta/go.mod tools/rosetta/go.sum /work/tools/rosetta/ COPY collections/go.mod collections/go.sum /work/collections/ COPY store/go.mod store/go.sum /work/store/ +COPY log/go.mod log/go.sum /work/store/ RUN go mod download COPY ./ /work @@ -29,4 +30,3 @@ WORKDIR /simd COPY contrib/images/simd-env/wrapper.sh /usr/bin/wrapper.sh COPY --from=build /work/build/simd /simd/ - From 0f52d335491282e1c777a1affcb16c44a5d1386a Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 6 Feb 2023 23:33:52 -0500 Subject: [PATCH 13/14] fix typp --- contrib/images/simd-env/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/images/simd-env/Dockerfile b/contrib/images/simd-env/Dockerfile index 3d8471aa922c..00b178342223 100644 --- a/contrib/images/simd-env/Dockerfile +++ b/contrib/images/simd-env/Dockerfile @@ -12,7 +12,7 @@ COPY depinject/go.mod depinject/go.sum /work/depinject/ COPY tools/rosetta/go.mod tools/rosetta/go.sum /work/tools/rosetta/ COPY collections/go.mod collections/go.sum /work/collections/ COPY store/go.mod store/go.sum /work/store/ -COPY log/go.mod log/go.sum /work/store/ +COPY log/go.mod log/go.sum /work/log/ RUN go mod download COPY ./ /work From 74b509b55b0cda3ed23083d4b95712fbfe8940c6 Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Mon, 6 Feb 2023 23:59:37 -0500 Subject: [PATCH 14/14] fix test --- tests/e2e/server/export_test.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/e2e/server/export_test.go b/tests/e2e/server/export_test.go index 2ae64febcd5a..9dc8d18cded3 100644 --- a/tests/e2e/server/export_test.go +++ b/tests/e2e/server/export_test.go @@ -12,15 +12,15 @@ import ( "path" "testing" - "github.com/spf13/cobra" - "github.com/stretchr/testify/require" - abci "github.com/cometbft/cometbft/abci/types" cmtjson "github.com/cometbft/cometbft/libs/json" - "github.com/cometbft/cometbft/libs/log" + cmtlog "github.com/cometbft/cometbft/libs/log" cmtproto "github.com/cometbft/cometbft/proto/tendermint/types" cmttypes "github.com/cometbft/cometbft/types" dbm "github.com/cosmos/cosmos-db" + "github.com/cosmos/cosmos-sdk/log" + "github.com/spf13/cobra" + "github.com/stretchr/testify/require" "cosmossdk.io/simapp" "github.com/cosmos/cosmos-sdk/client" @@ -170,7 +170,7 @@ func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, *c t.Fatalf("error creating config folder: %s", err) } - logger := log.NewTMLogger(log.NewSyncWriter(os.Stdout)) + logger := cmtlog.NewTMLogger(cmtlog.NewSyncWriter(os.Stdout)) db := dbm.NewMemDB() app := simapp.NewSimApp(logger, db, nil, true, simtestutil.NewAppOptionsWithFlagHome(tempDir))