LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore: various cleanup (#20864)

Browse Source
This commit is contained in:
Marko
2024-07-18 09:12:58 +00:00
committed by GitHub
parent 2370a50d86
commit 9436bcb7f2
113 changed files with 395 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baseapp/expected_keepers.go
-17
View File
@@ -1,17 +0,0 @@
package baseapp
import (
"context"
sdk "github.com/cosmos/cosmos-sdk/types"
)
type BankKeeper interface {
MintCoins(ctx context.Context, moduleName string, amt sdk.Coins) error
SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
GetBalance(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin
}
type AuthKeeper interface {
GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
}
baseapp/oe/optimistic_execution_test.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
abci "github.com/cometbft/cometbft/api/cometbft/abci/v1"
"github.com/stretchr/testify/assert"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
)
func testFinalizeBlock(_ context.Context, _ *abci.FinalizeBlockRequest) (*abci.FinalizeBlockResponse, error) {
@@ -16,7 +16,7 @@ func testFinalizeBlock(_ context.Context, _ *abci.FinalizeBlockRequest) (*abci.F
}
func TestOptimisticExecution(t *testing.T) {
oe := NewOptimisticExecution(log.NewNopLogger(), testFinalizeBlock)
oe := NewOptimisticExecution(coretesting.NewNopLogger(), testFinalizeBlock)
assert.True(t, oe.Enabled())
oe.Execute(&abci.ProcessProposalRequest{
Hash: []byte("test"),
client/v2/go.mod
+1
View File
@@ -171,6 +171,7 @@ require (
)
require (
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/schema v0.1.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
)
collections/go.mod
-2
View File
@@ -13,9 +13,7 @@ require (
github.com/cosmos/gogoproto v1.5.0 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/kr/text v0.2.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/tidwall/btree v1.7.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/net v0.27.0 // indirect
collections/go.sum
+1 -9
View File
@@ -1,20 +1,13 @@
github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52o=
github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
@@ -33,9 +26,8 @@ google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
pgregory.net/rapid v1.1.0 h1:CMa0sjHSru3puNx+J0MIAuiiEV4N0qj8/cMWGBBCsjw=
core/genesis/source_test.go
+18 -8
View File
@@ -5,31 +5,41 @@ import (
"io"
"testing"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/appmodule"
)
func TestSource(t *testing.T) {
source, err := SourceFromRawJSON(json.RawMessage(testJSON))
require.NoError(t, err)
if err != nil {
t.Errorf("Error creating source: %s", err)
}
expectJSON(t, source, "foo", fooContents)
expectJSON(t, source, "bar", barContents)
// missing fields just return nil, nil
r, err := source("baz")
require.NoError(t, err)
require.Nil(t, r)
if err != nil {
t.Errorf("Error retrieving field: %s", err)
}
if r != nil {
t.Errorf("Expected nil result for missing field, got: %v", r)
}
}
func expectJSON(t *testing.T, source appmodule.GenesisSource, field, contents string) {
t.Helper()
r, err := source(field)
require.NoError(t, err)
if err != nil {
t.Errorf("Error retrieving field: %s", err)
}
bz, err := io.ReadAll(r)
require.NoError(t, err)
require.Equal(t, contents, string(bz))
if err != nil {
t.Errorf("Error reading contents: %s", err)
}
if string(bz) != contents {
t.Errorf("Expected contents: %s, got: %s", contents, string(bz))
}
}
const (
core/genesis/target_test.go
+24 -10
View File
@@ -2,31 +2,45 @@ package genesis
import (
"testing"
"github.com/stretchr/testify/require"
)
func TestTarget(t *testing.T) {
target := &RawJSONTarget{}
w, err := target.Target()("foo")
require.NoError(t, err)
if err != nil {
t.Errorf("Error creating target: %s", err)
}
_, err = w.Write([]byte("1"))
require.NoError(t, err)
require.NoError(t, w.Close())
if err != nil {
t.Errorf("Error writing to target: %s", err)
}
if err := w.Close(); err != nil {
t.Errorf("Error closing target: %s", err)
}
w, err = target.Target()("bar")
require.NoError(t, err)
if err != nil {
t.Errorf("Error creating target: %s", err)
}
_, err = w.Write([]byte(`"abc"`))
require.NoError(t, err)
require.NoError(t, w.Close())
if err != nil {
t.Errorf("Error writing to target: %s", err)
}
if err := w.Close(); err != nil {
t.Errorf("Error closing target: %s", err)
}
bz, err := target.JSON()
require.NoError(t, err)
if err != nil {
t.Errorf("Error getting JSON: %s", err)
}
// test that it's correct by reading back with a source
source, err := SourceFromRawJSON(bz)
require.NoError(t, err)
if err != nil {
t.Errorf("Error creating source from JSON: %s", err)
}
expectJSON(t, source, "foo", "1")
expectJSON(t, source, "bar", `"abc"`)
core/go.mod
-7
View File
@@ -4,22 +4,15 @@ go 1.20
require (
github.com/cosmos/gogoproto v1.5.0
github.com/stretchr/testify v1.9.0
google.golang.org/grpc v1.64.1
)
require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/kr/pretty v0.3.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/rogpeppe/go-internal v1.11.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/net v0.27.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
core/go.sum
-23
View File
@@ -1,26 +1,8 @@
github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52o=
github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
@@ -35,8 +17,3 @@ google.golang.org/grpc v1.64.1 h1:LKtvyfbX3UGVPFcGqJ9ItpVWW6oN/2XqTxfAnwRRXiA=
google.golang.org/grpc v1.64.1/go.mod h1:hiQF4LFZelK2WKaP6W0L92zGHtiQdZxk8CrSdvyjeP0=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
core/header/service_test.go
+36 -10
View File
@@ -4,8 +4,6 @@ import (
"crypto/sha256"
"testing"
"time"
"github.com/stretchr/testify/require"
)
func TestInfo_Bytes(t *testing.T) {
@@ -28,8 +26,12 @@ func TestInfo_Bytes(t *testing.T) {
}
bytes, err := info.Bytes()
require.NoError(t, err)
require.Equal(t, expectedBytes, bytes)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if !bytesEqual(expectedBytes, bytes) {
t.Errorf("expected bytes %v, got %v", expectedBytes, bytes)
}
}
func TestInfo_FromBytes(t *testing.T) {
@@ -46,10 +48,34 @@ func TestInfo_FromBytes(t *testing.T) {
}
err := info.FromBytes(bytes)
require.NoError(t, err)
require.Equal(t, int64(12345), info.Height)
require.Equal(t, []byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.Hash)
require.Equal(t, time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC), info.Time)
require.Equal(t, []byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.AppHash)
require.Equal(t, "test-chain", info.ChainID)
if err != nil {
t.Errorf("unexpected error: %v", err)
}
if info.Height != 12345 {
t.Errorf("expected Height %d, got %d", 12345, info.Height)
}
if !bytesEqual([]byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.Hash) {
t.Errorf("expected Hash %v, got %v", []byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.Hash)
}
if info.Time != time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC) {
t.Errorf("expected Time %v, got %v", time.Date(2024, time.January, 1, 0, 0, 0, 0, time.UTC), info.Time)
}
if !bytesEqual([]byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.AppHash) {
t.Errorf("expected AppHash %v, got %v", []byte{0x26, 0xb0, 0xb8, 0x3e, 0x72, 0x81, 0xbe, 0x3b, 0x11, 0x76, 0x58, 0xb6, 0xf2, 0x63, 0x6d, 0x3, 0x68, 0xca, 0xd3, 0xd7, 0x4f, 0x22, 0x24, 0x34, 0x28, 0xf5, 0x40, 0x1a, 0x4b, 0x70, 0x89, 0x7e}, info.AppHash)
}
if info.ChainID != "test-chain" {
t.Errorf("expected ChainID %s, got %s", "test-chain", info.ChainID)
}
}
func bytesEqual(a, b []byte) bool {
if len(a) != len(b) {
return false
}
for i := range a {
if a[i] != b[i] {
return false
}
}
return true
}
core/log/noop.go → core/testing/noop.go
+10 -8
View File
@@ -1,7 +1,9 @@
package log
package coretesting
import "cosmossdk.io/core/log"
// NewNopLogger returns a new logger that does nothing.
func NewNopLogger() Logger {
func NewNopLogger() log.Logger {
// The custom nopLogger is about 3x faster than a zeroLogWrapper with zerolog.Nop().
return nopLogger{}
}
@@ -11,9 +13,9 @@ func NewNopLogger() Logger {
// The custom implementation is about 3x faster.
type nopLogger struct{}
func (nopLogger) Info(string, ...any) {}
func (nopLogger) Warn(string, ...any) {}
func (nopLogger) Error(string, ...any) {}
func (nopLogger) Debug(string, ...any) {}
func (nopLogger) With(...any) Logger { return nopLogger{} }
func (nopLogger) Impl() any { return nopLogger{} }
func (nopLogger) Info(string, ...any) {}
func (nopLogger) Warn(string, ...any) {}
func (nopLogger) Error(string, ...any) {}
func (nopLogger) Debug(string, ...any) {}
func (nopLogger) With(...any) log.Logger { return nopLogger{} }
func (nopLogger) Impl() any { return nopLogger{} }
log/go.mod
+8 -1
View File
@@ -3,17 +3,24 @@ module cosmossdk.io/log
go 1.20
require (
cosmossdk.io/core v0.0.0-00010101000000-000000000000
cosmossdk.io/core v0.12.0
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
github.com/pkg/errors v0.9.1
github.com/rs/zerolog v1.33.0
gotest.tools/v3 v3.5.1
)
require (
github.com/cosmos/gogoproto v1.5.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/tidwall/btree v1.7.0 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d // indirect
golang.org/x/sys v0.22.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
)
replace cosmossdk.io/core => ../core
replace cosmossdk.io/core/testing => ../core/testing
log/go.sum
+9
View File
@@ -1,5 +1,8 @@
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52o=
github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I=
github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
@@ -13,10 +16,16 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
log/logger.go
+2 -1
View File
@@ -11,6 +11,7 @@ import (
"github.com/rs/zerolog/pkgerrors"
corelog "cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
)
func init() {
@@ -150,7 +151,7 @@ func (l zeroLogWrapper) Impl() interface{} {
}
// NewNopLogger returns a new logger that does nothing.
var NewNopLogger = corelog.NewNopLogger
var NewNopLogger = coretesting.NewNopLogger
// LogWrapper wraps a Logger and implements the Logger interface.
// it is only meant to avoid breakage of legacy versions of the Logger interface.
runtime/router_test.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
bankv1beta1 "cosmossdk.io/api/cosmos/bank/v1beta1"
counterv1 "cosmossdk.io/api/cosmos/counter/v1"
"cosmossdk.io/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"github.com/cosmos/cosmos-sdk/baseapp"
@@ -26,7 +26,7 @@ func TestRouterService(t *testing.T) {
queryRouter.SetInterfaceRegistry(interfaceRegistry)
key := storetypes.NewKVStoreKey(countertypes.StoreKey)
storeService := runtime.NewKVStoreService(key)
counterKeeper := counterkeeper.NewKeeper(runtime.NewEnvironment(storeService, log.NewNopLogger()))
counterKeeper := counterkeeper.NewKeeper(runtime.NewEnvironment(storeService, coretesting.NewNopLogger()))
countertypes.RegisterInterfaces(interfaceRegistry)
countertypes.RegisterMsgServer(msgRouter, counterKeeper)
countertypes.RegisterQueryServer(queryRouter, counterKeeper)
runtime/v2/go.mod
+2
View File
@@ -6,6 +6,7 @@ go 1.22.2
replace (
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/depinject => ../../depinject
cosmossdk.io/log => ../../log
cosmossdk.io/server/v2/appmanager => ../../server/v2/appmanager
@@ -38,6 +39,7 @@ require (
require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/errors v1.0.1 // indirect
cosmossdk.io/log v1.3.1 // indirect
github.com/DataDog/zstd v1.5.5 // indirect
schema/field.go
+3 -3
View File
@@ -33,7 +33,7 @@ func (c Field) Validate() error {
// valid kind
if err := c.Kind.Validate(); err != nil {
return fmt.Errorf("invalid field kind for %q: %v", c.Name, err)
return fmt.Errorf("invalid field kind for %q: %w", c.Name, err)
}
// address prefix only valid with Bech32AddressKind
@@ -46,7 +46,7 @@ func (c Field) Validate() error {
// enum definition only valid with EnumKind
if c.Kind == EnumKind {
if err := c.EnumDefinition.Validate(); err != nil {
return fmt.Errorf("invalid enum definition for field %q: %v", c.Name, err)
return fmt.Errorf("invalid enum definition for field %q: %w", c.Name, err)
}
} else if c.Kind != EnumKind && (c.EnumDefinition.Name != "" || c.EnumDefinition.Values != nil) {
return fmt.Errorf("enum definition is only valid for field %q with type EnumKind", c.Name)
@@ -67,7 +67,7 @@ func (c Field) ValidateValue(value interface{}) error {
}
err := c.Kind.ValidateValueType(value)
if err != nil {
return fmt.Errorf("invalid value for field %q: %v", c.Name, err)
return fmt.Errorf("invalid value for field %q: %w", c.Name, err)
}
if c.Kind == EnumKind {
schema/object_type.go
+3 -3
View File
@@ -43,7 +43,7 @@ func (o ObjectType) validate(enumValueMap map[string]map[string]bool) error {
for _, field := range o.KeyFields {
if err := field.Validate(); err != nil {
return fmt.Errorf("invalid key field %q: %v", field.Name, err)
return fmt.Errorf("invalid key field %q: %w", field.Name, err)
}
if field.Nullable {
@@ -62,7 +62,7 @@ func (o ObjectType) validate(enumValueMap map[string]map[string]bool) error {
for _, field := range o.ValueFields {
if err := field.Validate(); err != nil {
return fmt.Errorf("invalid value field %q: %v", field.Name, err)
return fmt.Errorf("invalid value field %q: %w", field.Name, err)
}
if fieldNames[field.Name] {
@@ -89,7 +89,7 @@ func (o ObjectType) ValidateObjectUpdate(update ObjectUpdate) error {
}
if err := ValidateObjectKey(o.KeyFields, update.Key); err != nil {
return fmt.Errorf("invalid key for object type %q: %v", update.TypeName, err)
return fmt.Errorf("invalid key for object type %q: %w", update.TypeName, err)
}
if update.Delete {
server/v2/appmanager/go.mod
-1
View File
@@ -9,7 +9,6 @@ require cosmossdk.io/core v0.12.0
require (
github.com/cosmos/gogoproto v1.5.0 // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
google.golang.org/protobuf v1.34.2 // indirect
)
server/v2/appmanager/go.sum
-8
View File
@@ -1,18 +1,10 @@
github.com/cosmos/gogoproto v1.5.0 h1:SDVwzEqZDDBoslaeZg+dGE55hdzHfgUA40pEanMh52o=
github.com/cosmos/gogoproto v1.5.0/go.mod h1:iUM31aofn3ymidYG6bUR5ZFrk+Om8p5s754eMUcyp8I=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM=
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U=
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw=
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
server/v2/cometbft/go.mod
+1
View File
@@ -50,6 +50,7 @@ require (
require (
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/depinject v1.0.0-alpha.4 // indirect
cosmossdk.io/log v1.3.1 // indirect
cosmossdk.io/math v1.3.0 // indirect
server/v2/go.mod
+3
View File
@@ -5,6 +5,7 @@ go 1.21
replace (
cosmossdk.io/api => ../../api
cosmossdk.io/core => ../../core
cosmossdk.io/core/testing => ../../core/testing
cosmossdk.io/depinject => ../../depinject
cosmossdk.io/log => ../../log
cosmossdk.io/server/v2/appmanager => ./appmanager
@@ -15,6 +16,7 @@ replace (
require (
cosmossdk.io/api v0.7.5
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/log v1.3.1
cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000
github.com/cosmos/cosmos-proto v1.0.0-beta.5
@@ -74,6 +76,7 @@ require (
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.6.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tidwall/btree v1.7.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
golang.org/x/net v0.27.0 // indirect
server/v2/go.sum
+2
View File
@@ -243,6 +243,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
server/v2/stf/go.mod
-1
View File
@@ -15,7 +15,6 @@ require (
require (
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/google/go-cmp v0.6.0 // indirect
github.com/kr/text v0.1.0 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
server/v2/stf/go.sum
+1 -9
View File
@@ -6,15 +6,8 @@ github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
@@ -23,8 +16,7 @@ golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM
golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
server/v2/streaming/streaming_test.go
+2 -1
View File
@@ -13,6 +13,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
)
type PluginTestSuite struct {
@@ -52,7 +53,7 @@ func (s *PluginTestSuite) SetupTest() {
abciListener, ok := raw.(Listener)
require.True(s.T(), ok, "should pass type check")
logger := log.NewNopLogger()
logger := coretesting.NewNopLogger()
streamingService := Manager{
Listeners: []Listener{abciListener},
StopNodeOnErr: true,
simapp/go.mod
+3 -5
View File
@@ -7,6 +7,7 @@ require (
cosmossdk.io/client/v2 v2.0.0-20230630094428-02b760776860
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/log v1.3.1
cosmossdk.io/math v1.3.0
@@ -18,6 +19,7 @@ require (
cosmossdk.io/x/authz v0.0.0-00010101000000-000000000000
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
cosmossdk.io/x/distribution v0.0.0-20240227221813-a248d05f70f4
cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337
cosmossdk.io/x/evidence v0.0.0-20230613133644-0a778132a60f
@@ -32,6 +34,7 @@ require (
cosmossdk.io/x/tx v0.13.3
cosmossdk.io/x/upgrade v0.0.0-20230613133644-0a778132a60f
github.com/cometbft/cometbft v1.0.0-rc1
github.com/cometbft/cometbft/api v1.0.0-rc.1
github.com/cosmos/cosmos-db v1.0.2
// this version is not used as it is always replaced by the latest Cosmos SDK version
github.com/cosmos/cosmos-sdk v0.51.0
@@ -45,10 +48,6 @@ require (
google.golang.org/protobuf v1.34.2
)
require github.com/cometbft/cometbft/api v1.0.0-rc.1
require cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000
require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
@@ -58,7 +57,6 @@ require (
cloud.google.com/go/compute/metadata v0.3.0 // indirect
cloud.google.com/go/iam v1.1.8 // indirect
cloud.google.com/go/storage v1.42.0 // indirect
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/errors v1.0.1 // indirect
cosmossdk.io/schema v0.1.1 // indirect
cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000 // indirect
simapp/sim_bench_test.go
+2 -3
View File
@@ -6,10 +6,9 @@ import (
"os"
"testing"
coretesting "cosmossdk.io/core/testing"
"github.com/cosmos/cosmos-sdk/testutils/sims"
"cosmossdk.io/core/log"
flag "github.com/spf13/pflag"
"github.com/spf13/viper"
"github.com/stretchr/testify/require"
@@ -61,7 +60,7 @@ func BenchmarkFullAppSimulation(b *testing.B) {
// run randomized simulation
simParams, simErr := simulation.SimulateFromSeedX(
b,
log.NewNopLogger(),
coretesting.NewNopLogger(),
os.Stdout,
app.BaseApp,
simtestutil.AppStateFn(app.AppCodec(), app.AuthKeeper.AddressCodec(), app.StakingKeeper.ValidatorAddressCodec(), app.SimulationManager(), app.DefaultGenesis()),
simapp/test_helpers.go
+3 -2
View File
@@ -13,6 +13,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
sdkmath "cosmossdk.io/math"
pruningtypes "cosmossdk.io/store/pruning/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -46,7 +47,7 @@ func setup(withGenesis bool, invCheckPeriod uint) (*SimApp, GenesisState) {
appOptions[flags.FlagHome] = DefaultNodeHome
appOptions[server.FlagInvCheckPeriod] = invCheckPeriod
app := NewSimApp(log.NewNopLogger(), db, nil, true, appOptions)
app := NewSimApp(coretesting.NewNopLogger(), db, nil, true, appOptions)
if withGenesis {
return app, app.DefaultGenesis()
}
@@ -225,7 +226,7 @@ func NewTestNetworkFixture() network.TestFixture {
}
defer os.RemoveAll(dir)
app := NewSimApp(log.NewNopLogger(), dbm.NewMemDB(), nil, true, simtestutil.NewAppOptionsWithFlagHome(dir))
app := NewSimApp(coretesting.NewNopLogger(), dbm.NewMemDB(), nil, true, simtestutil.NewAppOptionsWithFlagHome(dir))
appCtr := func(val network.ValidatorI) servertypes.Application {
return NewSimApp(
simapp/v2/go.mod
+2 -1
View File
@@ -42,6 +42,8 @@ require (
google.golang.org/protobuf v1.34.2
)
require cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
@@ -52,7 +54,6 @@ require (
cloud.google.com/go/iam v1.1.8 // indirect
cloud.google.com/go/storage v1.42.0 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/errors v1.0.1 // indirect
cosmossdk.io/schema v0.1.1 // indirect
cosmossdk.io/server/v2/appmanager v0.0.0-00010101000000-000000000000 // indirect
simapp/v2/simdv2/cmd/commands.go
+1 -1
View File
@@ -10,8 +10,8 @@ import (
"github.com/spf13/viper"
"cosmossdk.io/client/v2/offchain"
"cosmossdk.io/core/log"
"cosmossdk.io/core/transaction"
"cosmossdk.io/log"
runtimev2 "cosmossdk.io/runtime/v2"
serverv2 "cosmossdk.io/server/v2"
"cosmossdk.io/server/v2/api/grpc"
simapp/v2/simdv2/cmd/testnet.go
+2 -2
View File
@@ -14,7 +14,7 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/core/transaction"
"cosmossdk.io/math"
"cosmossdk.io/math/unsafe"
@@ -338,7 +338,7 @@ func initTestnetFiles[T transaction.Tx](
// Write server config
cometServer := cometbft.New[T](&temporaryTxDecoder[T]{clientCtx.TxConfig}, cometbft.ServerOptions[T]{}, cometbft.OverwriteDefaultCometConfig(nodeConfig))
grpcServer := grpc.New[T](grpc.OverwriteDefaultConfig(grpcConfig))
server := serverv2.NewServer(log.NewNopLogger(), cometServer, grpcServer)
server := serverv2.NewServer(coretesting.NewNopLogger(), cometServer, grpcServer)
err = server.WriteConfig(filepath.Join(nodeDir, "config"))
if err != nil {
return err
store/go.mod
+4 -1
View File
@@ -3,7 +3,8 @@ module cosmossdk.io/store
go 1.22.2
require (
cosmossdk.io/core v0.0.0-00010101000000-000000000000
cosmossdk.io/core v0.12.0
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/errors v1.0.1
cosmossdk.io/log v1.3.1
cosmossdk.io/math v1.3.0
@@ -29,6 +30,8 @@ require (
replace cosmossdk.io/core => ../core
replace cosmossdk.io/core/testing => ../core/testing
replace cosmossdk.io/log => ../log
require (
store/pruning/manager_test.go
+8 -8
View File
@@ -9,7 +9,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/mock"
"cosmossdk.io/store/pruning"
"cosmossdk.io/store/pruning/types"
@@ -18,7 +18,7 @@ import (
const dbErr = "db error"
func TestNewManager(t *testing.T) {
manager := pruning.NewManager(db.NewMemDB(), log.NewNopLogger())
manager := pruning.NewManager(db.NewMemDB(), coretesting.NewNopLogger())
require.NotNil(t, manager)
require.Equal(t, types.PruningNothing, manager.GetOptions().GetPruningStrategy())
}
@@ -79,7 +79,7 @@ func TestStrategies(t *testing.T) {
t.Run(name, func(t *testing.T) {
t.Parallel()
manager := pruning.NewManager(db.NewMemDB(), log.NewNopLogger())
manager := pruning.NewManager(db.NewMemDB(), coretesting.NewNopLogger())
require.NotNil(t, manager)
curStrategy := tc.strategy
@@ -186,7 +186,7 @@ func TestPruningHeight_Inputs(t *testing.T) {
for name, tc := range testcases {
t.Run(name, func(t *testing.T) {
manager := pruning.NewManager(db.NewMemDB(), log.NewNopLogger())
manager := pruning.NewManager(db.NewMemDB(), coretesting.NewNopLogger())
require.NotNil(t, manager)
manager.SetOptions(types.NewPruningOptions(tc.strategy))
@@ -204,7 +204,7 @@ func TestHandleSnapshotHeight_DbErr_Panic(t *testing.T) {
dbMock.EXPECT().SetSync(gomock.Any(), gomock.Any()).Return(errors.New(dbErr)).Times(1)
manager := pruning.NewManager(dbMock, log.NewNopLogger())
manager := pruning.NewManager(dbMock, coretesting.NewNopLogger())
manager.SetOptions(types.NewPruningOptions(types.PruningEverything))
require.NotNil(t, manager)
@@ -222,7 +222,7 @@ func TestHandleSnapshotHeight_LoadFromDisk(t *testing.T) {
// Setup
db := db.NewMemDB()
manager := pruning.NewManager(db, log.NewNopLogger())
manager := pruning.NewManager(db, coretesting.NewNopLogger())
require.NotNil(t, manager)
manager.SetOptions(types.NewPruningOptions(types.PruningEverything))
@@ -253,7 +253,7 @@ func TestHandleSnapshotHeight_LoadFromDisk(t *testing.T) {
func TestLoadPruningSnapshotHeights(t *testing.T) {
var (
manager = pruning.NewManager(db.NewMemDB(), log.NewNopLogger())
manager = pruning.NewManager(db.NewMemDB(), coretesting.NewNopLogger())
err error
)
require.NotNil(t, manager)
@@ -294,7 +294,7 @@ func TestLoadPruningSnapshotHeights(t *testing.T) {
}
func TestLoadSnapshotHeights_PruneNothing(t *testing.T) {
manager := pruning.NewManager(db.NewMemDB(), log.NewNopLogger())
manager := pruning.NewManager(db.NewMemDB(), coretesting.NewNopLogger())
require.NotNil(t, manager)
manager.SetOptions(types.NewPruningOptions(types.PruningNothing))
store/rootmulti/proof_test.go
+4 -4
View File
@@ -6,7 +6,7 @@ import (
dbm "github.com/cosmos/cosmos-db"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/iavl"
"cosmossdk.io/store/metrics"
"cosmossdk.io/store/types"
@@ -15,7 +15,7 @@ import (
func TestVerifyIAVLStoreQueryProof(t *testing.T) {
// Create main tree for testing.
db := dbm.NewMemDB()
iStore, err := iavl.LoadStore(db, log.NewNopLogger(), types.NewKVStoreKey("test"), types.CommitID{}, iavl.DefaultIAVLCacheSize, false, metrics.NewNoOpMetrics())
iStore, err := iavl.LoadStore(db, coretesting.NewNopLogger(), types.NewKVStoreKey("test"), types.CommitID{}, iavl.DefaultIAVLCacheSize, false, metrics.NewNoOpMetrics())
store := iStore.(*iavl.Store)
require.Nil(t, err)
store.Set([]byte("MYKEY"), []byte("MYVALUE"))
@@ -59,7 +59,7 @@ func TestVerifyIAVLStoreQueryProof(t *testing.T) {
func TestVerifyMultiStoreQueryProof(t *testing.T) {
// Create main tree for testing.
db := dbm.NewMemDB()
store := NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
iavlStoreKey := types.NewKVStoreKey("iavlStoreKey")
store.MountStoreWithDB(iavlStoreKey, types.StoreTypeIAVL, nil)
@@ -115,7 +115,7 @@ func TestVerifyMultiStoreQueryProof(t *testing.T) {
func TestVerifyMultiStoreQueryProofAbsence(t *testing.T) {
// Create main tree for testing.
db := dbm.NewMemDB()
store := NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
iavlStoreKey := types.NewKVStoreKey("iavlStoreKey")
store.MountStoreWithDB(iavlStoreKey, types.StoreTypeIAVL, nil)
store/rootmulti/snapshot_test.go
+5 -5
View File
@@ -14,7 +14,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/iavl"
"cosmossdk.io/store/metrics"
"cosmossdk.io/store/rootmulti"
@@ -24,7 +24,7 @@ import (
)
func newMultiStoreWithGeneratedData(db dbm.DB, stores uint8, storeKeys uint64) *rootmulti.Store {
multiStore := rootmulti.NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
multiStore := rootmulti.NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
r := rand.New(rand.NewSource(49872768940)) // Fixed seed for deterministic tests
keys := []*types.KVStoreKey{}
@@ -62,7 +62,7 @@ func newMultiStoreWithGeneratedData(db dbm.DB, stores uint8, storeKeys uint64) *
}
func newMultiStoreWithMixedMounts(db dbm.DB) *rootmulti.Store {
store := rootmulti.NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := rootmulti.NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
store.MountStoreWithDB(types.NewKVStoreKey("iavl1"), types.StoreTypeIAVL, nil)
store.MountStoreWithDB(types.NewKVStoreKey("iavl2"), types.StoreTypeIAVL, nil)
store.MountStoreWithDB(types.NewKVStoreKey("iavl3"), types.StoreTypeIAVL, nil)
@@ -245,7 +245,7 @@ func benchmarkMultistoreSnapshot(b *testing.B, stores uint8, storeKeys uint64) {
b.StartTimer()
for i := 0; i < b.N; i++ {
target := rootmulti.NewStore(dbm.NewMemDB(), log.NewNopLogger(), metrics.NewNoOpMetrics())
target := rootmulti.NewStore(dbm.NewMemDB(), coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
for _, key := range source.StoreKeysByName() {
target.MountStoreWithDB(key, types.StoreTypeIAVL, nil)
}
@@ -281,7 +281,7 @@ func benchmarkMultistoreSnapshotRestore(b *testing.B, stores uint8, storeKeys ui
b.StartTimer()
for i := 0; i < b.N; i++ {
target := rootmulti.NewStore(dbm.NewMemDB(), log.NewNopLogger(), metrics.NewNoOpMetrics())
target := rootmulti.NewStore(dbm.NewMemDB(), coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
for _, key := range source.StoreKeysByName() {
target.MountStoreWithDB(key, types.StoreTypeIAVL, nil)
}
store/rootmulti/store_test.go
+7 -7
View File
@@ -10,7 +10,7 @@ import (
dbm "github.com/cosmos/cosmos-db"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/errors"
"cosmossdk.io/store/cachemulti"
"cosmossdk.io/store/iavl"
@@ -22,7 +22,7 @@ import (
func TestStoreType(t *testing.T) {
db := dbm.NewMemDB()
store := NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
store.MountStoreWithDB(types.NewKVStoreKey("store1"), types.StoreTypeIAVL, db)
}
@@ -45,7 +45,7 @@ func TestGetCommitKVStore(t *testing.T) {
func TestStoreMount(t *testing.T) {
db := dbm.NewMemDB()
store := NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
key1 := types.NewKVStoreKey("store1")
key2 := types.NewKVStoreKey("store2")
@@ -652,7 +652,7 @@ func (p *pauseableCommitKVStoreStub) PausePruning(b bool) {
}
func TestPausePruningOnCommit(t *testing.T) {
store := NewStore(dbm.NewMemDB(), log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(dbm.NewMemDB(), coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
store.SetPruning(pruningtypes.NewCustomPruningOptions(2, 11))
store.MountStoreWithDB(testStoreKey1, types.StoreTypeIAVL, nil)
require.NoError(t, store.LoadLatestVersion())
@@ -833,7 +833,7 @@ var (
)
func newMultiStoreWithMounts(db dbm.DB, pruningOpts pruningtypes.PruningOptions) *Store {
store := NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
store.SetPruning(pruningOpts)
store.MountStoreWithDB(testStoreKey1, types.StoreTypeIAVL, nil)
@@ -844,7 +844,7 @@ func newMultiStoreWithMounts(db dbm.DB, pruningOpts pruningtypes.PruningOptions)
}
func newMultiStoreWithModifiedMounts(db dbm.DB, pruningOpts pruningtypes.PruningOptions) (*Store, *types.StoreUpgrades) {
store := NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
store.SetPruning(pruningOpts)
store.MountStoreWithDB(types.NewKVStoreKey("store1"), types.StoreTypeIAVL, nil)
@@ -970,7 +970,7 @@ func (stub *commitKVStoreStub) Commit() types.CommitID {
func prepareStoreMap() (map[types.StoreKey]types.CommitKVStore, error) {
var db dbm.DB = dbm.NewMemDB()
store := NewStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
store := NewStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
store.MountStoreWithDB(types.NewKVStoreKey("iavl1"), types.StoreTypeIAVL, nil)
store.MountStoreWithDB(types.NewKVStoreKey("iavl2"), types.StoreTypeIAVL, nil)
store.MountStoreWithDB(types.NewTransientStoreKey("trans1"), types.StoreTypeTransient, nil)
store/snapshots/helpers_test.go
+2 -2
View File
@@ -15,7 +15,7 @@ import (
protoio "github.com/cosmos/gogoproto/io"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
errorsmod "cosmossdk.io/errors"
"cosmossdk.io/store/snapshots"
snapshottypes "cosmossdk.io/store/snapshots/types"
@@ -211,7 +211,7 @@ func setupBusyManager(t *testing.T) *snapshots.Manager {
require.NoError(t, err)
hung := newHungSnapshotter()
hung.SetSnapshotInterval(opts.Interval)
mgr := snapshots.NewManager(store, opts, hung, nil, log.NewNopLogger())
mgr := snapshots.NewManager(store, opts, hung, nil, coretesting.NewNopLogger())
require.Equal(t, opts.Interval, hung.snapshotInterval)
// Channel to ensure the test doesn't finish until the goroutine is done.
store/snapshots/manager_test.go
+7 -7
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/snapshots"
"cosmossdk.io/store/snapshots/types"
)
@@ -19,7 +19,7 @@ func TestManager_List(t *testing.T) {
store := setupStore(t)
snapshotter := &mockSnapshotter{}
snapshotter.SetSnapshotInterval(opts.Interval)
manager := snapshots.NewManager(store, opts, snapshotter, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, snapshotter, nil, coretesting.NewNopLogger())
require.Equal(t, opts.Interval, snapshotter.GetSnapshotInterval())
mgrList, err := manager.List()
@@ -41,7 +41,7 @@ func TestManager_List(t *testing.T) {
func TestManager_LoadChunk(t *testing.T) {
store := setupStore(t)
manager := snapshots.NewManager(store, opts, &mockSnapshotter{}, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, &mockSnapshotter{}, nil, coretesting.NewNopLogger())
// Existing chunk should return body
chunk, err := manager.LoadChunk(2, 1, 1)
@@ -74,7 +74,7 @@ func TestManager_Take(t *testing.T) {
extSnapshotter := newExtSnapshotter(10)
expectChunks := snapshotItems(items, extSnapshotter)
manager := snapshots.NewManager(store, opts, snapshotter, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, snapshotter, nil, coretesting.NewNopLogger())
err := manager.RegisterExtensions(extSnapshotter)
require.NoError(t, err)
@@ -119,7 +119,7 @@ func TestManager_Prune(t *testing.T) {
store := setupStore(t)
snapshotter := &mockSnapshotter{}
snapshotter.SetSnapshotInterval(opts.Interval)
manager := snapshots.NewManager(store, opts, snapshotter, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, snapshotter, nil, coretesting.NewNopLogger())
pruned, err := manager.Prune(2)
require.NoError(t, err)
@@ -141,7 +141,7 @@ func TestManager_Restore(t *testing.T) {
prunedHeights: make(map[int64]struct{}),
}
extSnapshotter := newExtSnapshotter(0)
manager := snapshots.NewManager(store, opts, target, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, target, nil, coretesting.NewNopLogger())
err := manager.RegisterExtensions(extSnapshotter)
require.NoError(t, err)
@@ -251,7 +251,7 @@ func TestManager_TakeError(t *testing.T) {
snapshotter := &mockErrorSnapshotter{}
store, err := snapshots.NewStore(db.NewMemDB(), GetTempDir(t))
require.NoError(t, err)
manager := snapshots.NewManager(store, opts, snapshotter, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, snapshotter, nil, coretesting.NewNopLogger())
_, err = manager.Create(1)
require.Error(t, err)
store/streaming/streaming_test.go
+2 -1
View File
@@ -16,6 +16,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
)
@@ -58,7 +59,7 @@ func (s *PluginTestSuite) SetupTest() {
require.True(s.T(), ok, "should pass type check")
header := cmtproto.Header{Height: 1, Time: time.Now()}
logger := log.NewNopLogger()
logger := coretesting.NewNopLogger()
streamingService := storetypes.StreamingManager{
ABCIListeners: []storetypes.ABCIListener{abciListener},
StopNodeOnErr: true,
store/types/iterator_test.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
dbm "github.com/cosmos/cosmos-db"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/iavl"
"cosmossdk.io/store/metrics"
"cosmossdk.io/store/types"
@@ -15,7 +15,7 @@ import (
func newMemTestKVStore(t *testing.T) types.KVStore {
t.Helper()
db := dbm.NewMemDB()
store, err := iavl.LoadStore(db, log.NewNopLogger(), types.NewKVStoreKey("test"), types.CommitID{}, iavl.DefaultIAVLCacheSize, false, metrics.NewNoOpMetrics())
store, err := iavl.LoadStore(db, coretesting.NewNopLogger(), types.NewKVStoreKey("test"), types.CommitID{}, iavl.DefaultIAVLCacheSize, false, metrics.NewNoOpMetrics())
require.NoError(t, err)
return store
}
store/v2/commitment/iavl/tree_test.go
+2 -1
View File
@@ -9,6 +9,7 @@ import (
"cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2/commitment"
dbm "cosmossdk.io/store/v2/db"
)
@@ -32,7 +33,7 @@ func TestCommitterSuite(t *testing.T) {
func generateTree() *IavlTree {
cfg := DefaultConfig()
db := dbm.NewMemDB()
return NewIavlTree(db, log.NewNopLogger(), cfg)
return NewIavlTree(db, coretesting.NewNopLogger(), cfg)
}
func TestIavlTree(t *testing.T) {
store/v2/commitment/store_bench_test.go
+3 -3
View File
@@ -10,8 +10,8 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2/commitment"
"cosmossdk.io/store/v2/commitment/iavl"
dbm "cosmossdk.io/store/v2/db"
@@ -63,10 +63,10 @@ func getCommitStore(b *testing.B, db corestore.KVStoreWithBatch) *commitment.Com
multiTrees := make(map[string]commitment.Tree)
for _, storeKey := range storeKeys {
prefixDB := dbm.NewPrefixDB(db, []byte(storeKey))
multiTrees[storeKey] = iavl.NewIavlTree(prefixDB, log.NewNopLogger(), iavl.DefaultConfig())
multiTrees[storeKey] = iavl.NewIavlTree(prefixDB, coretesting.NewNopLogger(), iavl.DefaultConfig())
}
sc, err := commitment.NewCommitStore(multiTrees, db, log.NewNopLogger())
sc, err := commitment.NewCommitStore(multiTrees, db, coretesting.NewNopLogger())
require.NoError(b, err)
return sc
store/v2/commitment/store_test_suite.go
+4 -3
View File
@@ -10,6 +10,7 @@ import (
"cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2"
dbm "cosmossdk.io/store/v2/db"
"cosmossdk.io/store/v2/snapshots"
@@ -30,7 +31,7 @@ type CommitStoreTestSuite struct {
func (s *CommitStoreTestSuite) TestStore_Snapshotter() {
storeKeys := []string{storeKey1, storeKey2}
commitStore, err := s.NewStore(dbm.NewMemDB(), storeKeys, log.NewNopLogger())
commitStore, err := s.NewStore(dbm.NewMemDB(), storeKeys, coretesting.NewNopLogger())
s.Require().NoError(err)
latestVersion := uint64(10)
@@ -64,7 +65,7 @@ func (s *CommitStoreTestSuite) TestStore_Snapshotter() {
},
}
targetStore, err := s.NewStore(dbm.NewMemDB(), storeKeys, log.NewNopLogger())
targetStore, err := s.NewStore(dbm.NewMemDB(), storeKeys, coretesting.NewNopLogger())
s.Require().NoError(err)
chunks := make(chan io.ReadCloser, kvCount*int(latestVersion))
@@ -126,7 +127,7 @@ func (s *CommitStoreTestSuite) TestStore_Snapshotter() {
func (s *CommitStoreTestSuite) TestStore_Pruning() {
storeKeys := []string{storeKey1, storeKey2}
pruneOpts := store.NewPruningOptionWithCustom(10, 5)
commitStore, err := s.NewStore(dbm.NewMemDB(), storeKeys, log.NewNopLogger())
commitStore, err := s.NewStore(dbm.NewMemDB(), storeKeys, coretesting.NewNopLogger())
s.Require().NoError(err)
latestVersion := uint64(100)
store/v2/go.mod
+5 -1
View File
@@ -4,6 +4,7 @@ go 1.21
require (
cosmossdk.io/core v0.12.0
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/errors v1.0.1
cosmossdk.io/log v1.3.1
github.com/cockroachdb/pebble v1.1.0
@@ -53,7 +54,8 @@ require (
github.com/prometheus/procfs v0.15.1 // indirect
github.com/rogpeppe/go-internal v1.12.0 // indirect
github.com/rs/zerolog v1.33.0 // indirect
golang.org/x/crypto v0.25.0 // indirect
github.com/tidwall/btree v1.7.0 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/text v0.16.0 // indirect
@@ -65,4 +67,6 @@ require (
replace cosmossdk.io/core => ../../core
replace cosmossdk.io/core/testing => ../../core/testing
replace cosmossdk.io/log => ../../log
store/v2/go.sum
+4 -2
View File
@@ -210,6 +210,8 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs=
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48=
github.com/tidwall/btree v1.7.0 h1:L1fkJH/AuEh5zBnnBbmTwQ5Lt+bRJ5A8EWecslvo9iI=
github.com/tidwall/btree v1.7.0/go.mod h1:twD9XRA5jj9VUQGELzDO4HPQTNJsoWWfYEL+EUQ2cKY=
github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM=
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -217,8 +219,8 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30=
golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M=
golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f h1:3CW0unweImhOzd5FmYuRsD4Y4oQFKZIjAnKbjV4WIrw=
golang.org/x/exp v0.0.0-20240314144324-c7f7c6466f7f/go.mod h1:CxmFvTBINI24O/j8iY7H1xHzx2i4OsyguNBmN/uPtqc=
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
store/v2/migration/manager_test.go
+8 -8
View File
@@ -6,8 +6,8 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2/commitment"
"cosmossdk.io/store/v2/commitment/iavl"
dbm "cosmossdk.io/store/v2/db"
@@ -25,35 +25,35 @@ func setupMigrationManager(t *testing.T, noCommitStore bool) (*Manager, *commitm
multiTrees := make(map[string]commitment.Tree)
for _, storeKey := range storeKeys {
prefixDB := dbm.NewPrefixDB(db, []byte(storeKey))
multiTrees[storeKey] = iavl.NewIavlTree(prefixDB, log.NewNopLogger(), iavl.DefaultConfig())
multiTrees[storeKey] = iavl.NewIavlTree(prefixDB, coretesting.NewNopLogger(), iavl.DefaultConfig())
}
commitStore, err := commitment.NewCommitStore(multiTrees, db, log.NewNopLogger())
commitStore, err := commitment.NewCommitStore(multiTrees, db, coretesting.NewNopLogger())
require.NoError(t, err)
snapshotsStore, err := snapshots.NewStore(t.TempDir())
require.NoError(t, err)
snapshotsManager := snapshots.NewManager(snapshotsStore, snapshots.NewSnapshotOptions(1500, 2), commitStore, nil, nil, log.NewNopLogger())
snapshotsManager := snapshots.NewManager(snapshotsStore, snapshots.NewSnapshotOptions(1500, 2), commitStore, nil, nil, coretesting.NewNopLogger())
storageDB, err := pebbledb.New(t.TempDir())
require.NoError(t, err)
newStorageStore := storage.NewStorageStore(storageDB, log.NewNopLogger()) // for store/v2
newStorageStore := storage.NewStorageStore(storageDB, coretesting.NewNopLogger()) // for store/v2
db1 := dbm.NewMemDB()
multiTrees1 := make(map[string]commitment.Tree)
for _, storeKey := range storeKeys {
prefixDB := dbm.NewPrefixDB(db1, []byte(storeKey))
multiTrees1[storeKey] = iavl.NewIavlTree(prefixDB, log.NewNopLogger(), iavl.DefaultConfig())
multiTrees1[storeKey] = iavl.NewIavlTree(prefixDB, coretesting.NewNopLogger(), iavl.DefaultConfig())
}
newCommitStore, err := commitment.NewCommitStore(multiTrees1, db1, log.NewNopLogger()) // for store/v2
newCommitStore, err := commitment.NewCommitStore(multiTrees1, db1, coretesting.NewNopLogger()) // for store/v2
require.NoError(t, err)
if noCommitStore {
newCommitStore = nil
}
return NewManager(db, snapshotsManager, newStorageStore, newCommitStore, log.NewNopLogger()), commitStore
return NewManager(db, snapshotsManager, newStorageStore, newCommitStore, coretesting.NewNopLogger()), commitStore
}
func TestMigrateState(t *testing.T) {
store/v2/root/migrate_test.go
+2 -2
View File
@@ -7,8 +7,8 @@ import (
"github.com/stretchr/testify/suite"
corelog "cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/log"
"cosmossdk.io/store/v2"
"cosmossdk.io/store/v2/commitment"
@@ -35,7 +35,7 @@ func TestMigrateStoreTestSuite(t *testing.T) {
func (s *MigrateStoreTestSuite) SetupTest() {
testLog := log.NewTestLogger(s.T())
nopLog := corelog.NewNopLogger()
nopLog := coretesting.NewNopLogger()
mdb := dbm.NewMemDB()
multiTrees := make(map[string]commitment.Tree)
store/v2/root/store_test.go
+6 -6
View File
@@ -9,8 +9,8 @@ import (
"github.com/stretchr/testify/suite"
coreheader "cosmossdk.io/core/header"
"cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2"
"cosmossdk.io/store/v2/commitment"
"cosmossdk.io/store/v2/commitment/iavl"
@@ -46,7 +46,7 @@ func TestStorageTestSuite(t *testing.T) {
}
func (s *RootStoreTestSuite) SetupTest() {
noopLog := log.NewNopLogger()
noopLog := coretesting.NewNopLogger()
sqliteDB, err := sqlite.New(s.T().TempDir())
s.Require().NoError(err)
@@ -66,7 +66,7 @@ func (s *RootStoreTestSuite) SetupTest() {
}
func (s *RootStoreTestSuite) newStoreWithPruneConfig(config *store.PruningOption) {
noopLog := log.NewNopLogger()
noopLog := coretesting.NewNopLogger()
sqliteDB, err := sqlite.New(s.T().TempDir())
s.Require().NoError(err)
@@ -91,7 +91,7 @@ func (s *RootStoreTestSuite) newStoreWithPruneConfig(config *store.PruningOption
}
func (s *RootStoreTestSuite) newStoreWithBackendMount(ss store.VersionedDatabase, sc store.Committer, pm *pruning.Manager) {
noopLog := log.NewNopLogger()
noopLog := coretesting.NewNopLogger()
rs, err := New(noopLog, ss, sc, pm, nil, nil)
s.Require().NoError(err)
@@ -554,7 +554,7 @@ func (s *RootStoreTestSuite) TestMultiStore_PruningRestart() {
Interval: 11,
}
noopLog := log.NewNopLogger()
noopLog := coretesting.NewNopLogger()
mdb1 := dbm.NewMemDB()
mdb2 := dbm.NewMemDB()
@@ -635,7 +635,7 @@ func (s *RootStoreTestSuite) TestMultiStore_PruningRestart() {
}
func (s *RootStoreTestSuite) TestMultiStoreRestart() {
noopLog := log.NewNopLogger()
noopLog := coretesting.NewNopLogger()
sqliteDB, err := sqlite.New(s.T().TempDir())
s.Require().NoError(err)
store/v2/snapshots/helpers_test.go
+2 -2
View File
@@ -13,8 +13,8 @@ import (
protoio "github.com/cosmos/gogoproto/io"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
errorsmod "cosmossdk.io/errors"
"cosmossdk.io/store/v2/snapshots"
snapshotstypes "cosmossdk.io/store/v2/snapshots/types"
@@ -190,7 +190,7 @@ func setupBusyManager(t *testing.T) *snapshots.Manager {
store, err := snapshots.NewStore(t.TempDir())
require.NoError(t, err)
hung := newHungCommitSnapshotter()
mgr := snapshots.NewManager(store, opts, hung, &mockStorageSnapshotter{}, nil, log.NewNopLogger())
mgr := snapshots.NewManager(store, opts, hung, &mockStorageSnapshotter{}, nil, coretesting.NewNopLogger())
// Channel to ensure the test doesn't finish until the goroutine is done.
// Without this, there are intermittent test failures about
store/v2/snapshots/manager_test.go
+7 -7
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2/snapshots"
"cosmossdk.io/store/v2/snapshots/types"
)
@@ -18,7 +18,7 @@ func TestManager_List(t *testing.T) {
store := setupStore(t)
commitSnapshotter := &mockCommitSnapshotter{}
storageSnapshotter := &mockStorageSnapshotter{}
manager := snapshots.NewManager(store, opts, commitSnapshotter, storageSnapshotter, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, commitSnapshotter, storageSnapshotter, nil, coretesting.NewNopLogger())
mgrList, err := manager.List()
require.NoError(t, err)
@@ -39,7 +39,7 @@ func TestManager_List(t *testing.T) {
func TestManager_LoadChunk(t *testing.T) {
store := setupStore(t)
manager := snapshots.NewManager(store, opts, &mockCommitSnapshotter{}, &mockStorageSnapshotter{}, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, &mockCommitSnapshotter{}, &mockStorageSnapshotter{}, nil, coretesting.NewNopLogger())
// Existing chunk should return body
chunk, err := manager.LoadChunk(2, 1, 1)
@@ -71,7 +71,7 @@ func TestManager_Take(t *testing.T) {
extSnapshotter := newExtSnapshotter(10)
expectChunks := snapshotItems(items, extSnapshotter)
manager := snapshots.NewManager(store, opts, commitSnapshotter, &mockStorageSnapshotter{}, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, commitSnapshotter, &mockStorageSnapshotter{}, nil, coretesting.NewNopLogger())
err := manager.RegisterExtensions(extSnapshotter)
require.NoError(t, err)
@@ -110,7 +110,7 @@ func TestManager_Take(t *testing.T) {
func TestManager_Prune(t *testing.T) {
store := setupStore(t)
manager := snapshots.NewManager(store, opts, &mockCommitSnapshotter{}, &mockStorageSnapshotter{}, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, &mockCommitSnapshotter{}, &mockStorageSnapshotter{}, nil, coretesting.NewNopLogger())
pruned, err := manager.Prune(2)
require.NoError(t, err)
@@ -130,7 +130,7 @@ func TestManager_Restore(t *testing.T) {
store := setupStore(t)
target := &mockCommitSnapshotter{}
extSnapshotter := newExtSnapshotter(0)
manager := snapshots.NewManager(store, opts, target, &mockStorageSnapshotter{}, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, target, &mockStorageSnapshotter{}, nil, coretesting.NewNopLogger())
err := manager.RegisterExtensions(extSnapshotter)
require.NoError(t, err)
@@ -249,7 +249,7 @@ func TestManager_TakeError(t *testing.T) {
snapshotter := &mockErrorCommitSnapshotter{}
store, err := snapshots.NewStore(t.TempDir())
require.NoError(t, err)
manager := snapshots.NewManager(store, opts, snapshotter, &mockStorageSnapshotter{}, nil, log.NewNopLogger())
manager := snapshots.NewManager(store, opts, snapshotter, &mockStorageSnapshotter{}, nil, coretesting.NewNopLogger())
_, err = manager.Create(1)
require.Error(t, err)
store/v2/storage/pebbledb/db_test.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2/storage"
)
@@ -19,7 +19,7 @@ func TestStorageTestSuite(t *testing.T) {
db.SetSync(false)
}
return storage.NewStorageStore(db, log.NewNopLogger()), err
return storage.NewStorageStore(db, coretesting.NewNopLogger()), err
},
EmptyBatchSize: 12,
}
store/v2/storage/rocksdb/db_test.go
+2 -2
View File
@@ -10,7 +10,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2/storage"
)
@@ -20,7 +20,7 @@ func TestStorageTestSuite(t *testing.T) {
s := &storage.StorageTestSuite{
NewDB: func(dir string) (*storage.StorageStore, error) {
db, err := New(dir)
return storage.NewStorageStore(db, log.NewNopLogger()), err
return storage.NewStorageStore(db, coretesting.NewNopLogger()), err
},
EmptyBatchSize: 12,
}
store/v2/storage/sqlite/db_test.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2/storage"
)
@@ -18,7 +18,7 @@ func TestStorageTestSuite(t *testing.T) {
s := &storage.StorageTestSuite{
NewDB: func(dir string) (*storage.StorageStore, error) {
db, err := New(dir)
return storage.NewStorageStore(db, log.NewNopLogger()), err
return storage.NewStorageStore(db, coretesting.NewNopLogger()), err
},
EmptyBatchSize: 0,
}
store/v2/storage/storage_bench_test.go
+4 -4
View File
@@ -12,8 +12,8 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
corestore "cosmossdk.io/core/store"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store/v2"
"cosmossdk.io/store/v2/storage"
"cosmossdk.io/store/v2/storage/pebbledb"
@@ -27,7 +27,7 @@ var (
backends = map[string]func(dataDir string) (store.VersionedDatabase, error){
"rocksdb_versiondb_opts": func(dataDir string) (store.VersionedDatabase, error) {
db, err := rocksdb.New(dataDir)
return storage.NewStorageStore(db, log.NewNopLogger()), err
return storage.NewStorageStore(db, coretesting.NewNopLogger()), err
},
"pebbledb_default_opts": func(dataDir string) (store.VersionedDatabase, error) {
db, err := pebbledb.New(dataDir)
@@ -35,11 +35,11 @@ var (
db.SetSync(false)
}
return storage.NewStorageStore(db, log.NewNopLogger()), err
return storage.NewStorageStore(db, coretesting.NewNopLogger()), err
},
"btree_sqlite": func(dataDir string) (store.VersionedDatabase, error) {
db, err := sqlite.New(dataDir)
return storage.NewStorageStore(db, log.NewNopLogger()), err
return storage.NewStorageStore(db, coretesting.NewNopLogger()), err
},
}
rng = rand.New(rand.NewSource(567320))
tests/e2e/baseapp/block_gas_test.go
+2 -3
View File
@@ -20,7 +20,6 @@ import (
_ "cosmossdk.io/x/accounts"
xauthsigning "cosmossdk.io/x/auth/signing"
"github.com/cosmos/cosmos-sdk/baseapp"
baseapptestutil "github.com/cosmos/cosmos-sdk/baseapp/testutil"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/tx"
@@ -74,8 +73,8 @@ func TestBaseApp_BlockGas(t *testing.T) {
for _, tc := range testcases {
var (
bankKeeper baseapp.BankKeeper
accountKeeper baseapp.AuthKeeper
bankKeeper baseapputil.BankKeeper
accountKeeper baseapputil.AuthKeeper
appBuilder *runtime.AppBuilder
txConfig client.TxConfig
cdc codec.Codec
tests/e2e/baseapp/utils.go
+11
View File
@@ -1,6 +1,7 @@
package baseapp
import (
"context"
"encoding/json"
"testing"
@@ -54,3 +55,13 @@ func GenesisStateWithSingleValidator(t *testing.T, codec codec.Codec, builder *r
return genesisState
}
type BankKeeper interface {
MintCoins(ctx context.Context, moduleName string, amt sdk.Coins) error
SendCoinsFromModuleToAccount(ctx context.Context, senderModule string, recipientAddr sdk.AccAddress, amt sdk.Coins) error
GetBalance(ctx context.Context, addr sdk.AccAddress, denom string) sdk.Coin
}
type AuthKeeper interface {
GetAccount(ctx context.Context, addr sdk.AccAddress) sdk.AccountI
}
tests/go.mod
+1 -1
View File
@@ -34,6 +34,7 @@ require (
)
require (
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/x/accounts v0.0.0-20240226161501-23359a0b6d91
cosmossdk.io/x/accounts/defaults/lockup v0.0.0-20240417181816-5e7aae0db1f5
cosmossdk.io/x/accounts/defaults/multisig v0.0.0-00010101000000-000000000000
@@ -64,7 +65,6 @@ require (
cloud.google.com/go/iam v1.1.8 // indirect
cloud.google.com/go/storage v1.42.0 // indirect
cosmossdk.io/client/v2 v2.0.0-20230630094428-02b760776860 // indirect
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/schema v0.1.1 // indirect
cosmossdk.io/x/circuit v0.0.0-20230613133644-0a778132a60f // indirect
cosmossdk.io/x/epochs v0.0.0-20240522060652-a1ae4c3e0337 // indirect
tests/integration/store/rootmulti/rollback_test.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
dbm "github.com/cosmos/cosmos-db"
"gotest.tools/v3/assert"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/simapp"
simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
@@ -18,7 +18,7 @@ import (
func TestRollback(t *testing.T) {
db := dbm.NewMemDB()
options := simapp.SetupOptions{
Logger: log.NewNopLogger(),
Logger: coretesting.NewNopLogger(),
DB: db,
AppOpts: simtestutil.NewAppOptionsWithFlagHome(t.TempDir()),
}
testutil/context.go
+7 -7
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/assert"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/store"
"cosmossdk.io/store/metrics"
storetypes "cosmossdk.io/store/types"
@@ -19,14 +19,14 @@ import (
// DefaultContext creates a sdk.Context with a fresh MemDB that can be used in tests.
func DefaultContext(key, tkey storetypes.StoreKey) sdk.Context {
db := dbm.NewMemDB()
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
cms := store.NewCommitMultiStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
cms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db)
err := cms.LoadLatestVersion()
if err != nil {
panic(err)
}
ctx := sdk.NewContext(cms, false, log.NewNopLogger())
ctx := sdk.NewContext(cms, false, coretesting.NewNopLogger())
return ctx
}
@@ -39,7 +39,7 @@ func DefaultContextWithKeys(
memKeys map[string]*storetypes.MemoryStoreKey,
) sdk.Context {
db := dbm.NewMemDB()
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
cms := store.NewCommitMultiStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
for _, key := range keys {
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
@@ -58,7 +58,7 @@ func DefaultContextWithKeys(
panic(err)
}
return sdk.NewContext(cms, false, log.NewNopLogger())
return sdk.NewContext(cms, false, coretesting.NewNopLogger())
}
type TestContext struct {
@@ -70,13 +70,13 @@ type TestContext struct {
func DefaultContextWithDB(tb testing.TB, key, tkey storetypes.StoreKey) TestContext {
tb.Helper()
db := dbm.NewMemDB()
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
cms := store.NewCommitMultiStore(db, coretesting.NewNopLogger(), metrics.NewNoOpMetrics())
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
cms.MountStoreWithDB(tkey, storetypes.StoreTypeTransient, db)
err := cms.LoadLatestVersion()
assert.NoError(tb, err)
ctx := sdk.NewContext(cms, false, log.NewNopLogger()).WithHeaderInfo(header.Info{Time: time.Now()})
ctx := sdk.NewContext(cms, false, coretesting.NewNopLogger()).WithHeaderInfo(header.Info{Time: time.Now()})
return TestContext{ctx, db, cms}
}
types/mempool/mempool_test.go
+3 -3
View File
@@ -11,7 +11,7 @@ import (
_ "cosmossdk.io/api/cosmos/counter/v1"
_ "cosmossdk.io/api/cosmos/crypto/secp256k1"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/core/transaction"
"cosmossdk.io/x/auth/signing"
@@ -174,7 +174,7 @@ func fetchTxs(iterator mempool.Iterator, maxBytes int64) []sdk.Tx {
func (s *MempoolTestSuite) TestDefaultMempool() {
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 10)
txCount := 1000
var txs []testTx
@@ -266,7 +266,7 @@ func TestMempoolTestSuite(t *testing.T) {
}
func (s *MempoolTestSuite) TestSampleTxs() {
ctxt := sdk.NewContext(nil, false, log.NewNopLogger())
ctxt := sdk.NewContext(nil, false, coretesting.NewNopLogger())
t := s.T()
s.resetMempool()
mp := s.mempool
types/mempool/priority_nonce_test.go
+10 -10
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/x/auth/signing"
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -83,7 +83,7 @@ func (a signerExtractionAdapter) GetSigners(tx sdk.Tx) ([]mempool.SignerData, er
func (s *MempoolTestSuite) TestPriorityNonceTxOrderWithAdapter() {
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
sa := accounts[0].Address
sb := accounts[1].Address
@@ -142,7 +142,7 @@ func (s *MempoolTestSuite) TestPriorityNonceTxOrderWithAdapter() {
func (s *MempoolTestSuite) TestPriorityNonceTxOrder() {
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
sa := accounts[0].Address
sb := accounts[1].Address
@@ -341,7 +341,7 @@ func (s *MempoolTestSuite) TestPriorityNonceTxOrder() {
func (s *MempoolTestSuite) TestIterator() {
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 2)
sa := accounts[0].Address
sb := accounts[1].Address
@@ -396,7 +396,7 @@ func (s *MempoolTestSuite) TestIterator() {
}
func (s *MempoolTestSuite) TestPriorityTies() {
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 3)
sa := accounts[0].Address
sb := accounts[1].Address
@@ -520,7 +520,7 @@ func (s *MempoolTestSuite) TestRandomGeneratedTxs() {
)
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
seed := time.Now().UnixNano()
t.Logf("running with seed: %d", seed)
@@ -556,7 +556,7 @@ func (s *MempoolTestSuite) TestRandomWalkTxs() {
s.mempool = mempool.DefaultPriorityMempool()
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
seed := time.Now().UnixNano()
// interesting failing seeds:
@@ -729,7 +729,7 @@ func TestTxOrderN(t *testing.T) {
func TestPriorityNonceMempool_NextSenderTx(t *testing.T) {
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 2)
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accA := accounts[0].Address
accB := accounts[1].Address
@@ -759,7 +759,7 @@ func TestPriorityNonceMempool_NextSenderTx(t *testing.T) {
func TestNextSenderTx_TxLimit(t *testing.T) {
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 2)
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
sa := accounts[0].Address
sb := accounts[1].Address
@@ -835,7 +835,7 @@ func TestNextSenderTx_TxLimit(t *testing.T) {
func TestNextSenderTx_TxReplacement(t *testing.T) {
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
sa := accounts[0].Address
txs := []testTx{
types/mempool/sender_nonce_property_test.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/require"
"pgregory.net/rapid"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/x/auth/signing"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
@@ -33,7 +33,7 @@ func AddressGenerator(t *rapid.T) *rapid.Generator[sdk.AccAddress] {
}
func testMempoolProperties(t *rapid.T) {
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
mp := mempool.NewSenderNonceMempool()
genMultipleAddress := rapid.SliceOfNDistinct(AddressGenerator(t), 1, 10, func(acc sdk.AccAddress) string {
types/mempool/sender_nonce_test.go
+4 -4
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/mempool"
@@ -16,7 +16,7 @@ import (
func (s *MempoolTestSuite) TestTxOrder() {
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
sa := accounts[0].Address
sb := accounts[1].Address
@@ -140,7 +140,7 @@ func (s *MempoolTestSuite) TestTxOrder() {
func (s *MempoolTestSuite) TestMaxTx() {
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
mp := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(1))
@@ -170,7 +170,7 @@ func (s *MempoolTestSuite) TestMaxTx() {
func (s *MempoolTestSuite) TestTxNotFoundOnSender() {
t := s.T()
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
mp := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(5000))
types/module/module_test.go
+5 -5
View File
@@ -14,7 +14,7 @@ import (
"google.golang.org/grpc"
"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
authtypes "cosmossdk.io/x/auth/types"
"github.com/cosmos/cosmos-sdk/codec"
@@ -171,7 +171,7 @@ func TestManager_InitGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 3, len(mm.Modules))
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
genesisData := map[string]json.RawMessage{"module1": json.RawMessage(`{"key": "value"}`)}
// this should error since the validator set is empty even after init genesis
@@ -220,7 +220,7 @@ func TestManager_ExportGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 3, len(mm.Modules))
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
mockAppModule1.EXPECT().ExportGenesis(gomock.Eq(ctx)).AnyTimes().Return(json.RawMessage(`{"key1": "value1"}`), nil)
mockAppModule2.EXPECT().ExportGenesis(gomock.Eq(ctx)).AnyTimes().Return(json.RawMessage(`{"key2": "value2"}`), nil)
@@ -304,7 +304,7 @@ func TestCoreAPIManager_InitGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 1, len(mm.Modules))
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
genesisData := map[string]json.RawMessage{"module1": json.RawMessage(`{"key": "value"}`)}
// this should panic since the validator set is empty even after init genesis
@@ -326,7 +326,7 @@ func TestCoreAPIManager_ExportGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 2, len(mm.Modules))
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, coretesting.NewNopLogger())
want := map[string]json.RawMessage{
"module1": json.RawMessage(`{
"someField": "someKey"
x/auth/ante/testutil_test.go
+3 -3
View File
@@ -13,7 +13,7 @@ import (
_ "cosmossdk.io/api/cosmos/bank/v1beta1"
_ "cosmossdk.io/api/cosmos/crypto/secp256k1"
"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/auth"
"cosmossdk.io/x/auth/ante"
@@ -105,9 +105,9 @@ func SetupTestSuite(t *testing.T, isCheckTx bool) *AnteTestSuite {
}, nil).AnyTimes()
consensustypes.RegisterQueryServer(grpcQueryRouter, suite.consensusKeeper)
suite.env = runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger(), runtime.EnvWithQueryRouterService(grpcQueryRouter), runtime.EnvWithMsgRouterService(msgRouter))
suite.env = runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger(), runtime.EnvWithQueryRouterService(grpcQueryRouter), runtime.EnvWithMsgRouterService(msgRouter))
suite.accountKeeper = keeper.NewAccountKeeper(
runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger()), suite.encCfg.Codec, types.ProtoBaseAccount, suite.acctsModKeeper, maccPerms, authcodec.NewBech32Codec("cosmos"),
runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger()), suite.encCfg.Codec, types.ProtoBaseAccount, suite.acctsModKeeper, maccPerms, authcodec.NewBech32Codec("cosmos"),
sdk.Bech32MainPrefix, types.NewModuleAddress("gov").String(),
)
suite.accountKeeper.GetModuleAccount(suite.ctx, types.FeeCollectorName)
x/auth/keeper/deterministic_test.go
+3 -3
View File
@@ -13,7 +13,7 @@ import (
"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/auth"
authcodec "cosmossdk.io/x/auth/codec"
@@ -62,7 +62,7 @@ func (suite *DeterministicTestSuite) SetupTest() {
suite.Require()
key := storetypes.NewKVStoreKey(types.StoreKey)
storeService := runtime.NewKVStoreService(key)
env := runtime.NewEnvironment(storeService, log.NewNopLogger())
env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger())
testCtx := testutil.DefaultContextWithDB(suite.T(), key, storetypes.NewTransientStoreKey("transient_test"))
suite.ctx = testCtx.Ctx.WithHeaderInfo(header.Info{})
@@ -155,7 +155,7 @@ func (suite *DeterministicTestSuite) TestGRPCQueryAccount() {
}
// pubkeyGenerator creates and returns a random pubkey generator using rapid.
func pubkeyGenerator(t *rapid.T) *rapid.Generator[secp256k1.PubKey] {
func pubkeyGenerator(_ *rapid.T) *rapid.Generator[secp256k1.PubKey] {
return rapid.Custom(func(t *rapid.T) secp256k1.PubKey {
pkBz := rapid.SliceOfN(rapid.Byte(), 33, 33).Draw(t, "hex")
return secp256k1.PubKey{Key: pkBz}
x/auth/keeper/keeper_test.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/auth"
authcodec "cosmossdk.io/x/auth/codec"
@@ -55,7 +55,7 @@ func (suite *KeeperTestSuite) SetupTest() {
key := storetypes.NewKVStoreKey(types.StoreKey)
storeService := runtime.NewKVStoreService(key)
env := runtime.NewEnvironment(storeService, log.NewNopLogger())
env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger())
testCtx := testutil.DefaultContextWithDB(suite.T(), key, storetypes.NewTransientStoreKey("transient_test"))
suite.ctx = testCtx.Ctx.WithHeaderInfo(header.Info{})
x/auth/vesting/types/vesting_account_test.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
authcodec "cosmossdk.io/x/auth/codec"
"cosmossdk.io/x/auth/keeper"
@@ -44,7 +44,7 @@ func (s *VestingAccountTestSuite) SetupTest() {
encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{}, vesting.AppModule{})
key := storetypes.NewKVStoreKey(authtypes.StoreKey)
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
testCtx := testutil.DefaultContextWithDB(s.T(), key, storetypes.NewTransientStoreKey("transient_test"))
s.ctx = testCtx.Ctx.WithHeaderInfo(header.Info{})
x/authz/go.mod
+2
View File
@@ -165,6 +165,8 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)
require cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
require (
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
cosmossdk.io/log v1.3.1 // indirect
x/authz/keeper/genesis_test.go
+3 -3
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
sdkmath "cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/authz/keeper"
@@ -58,7 +58,7 @@ func (suite *GenesisTestSuite) SetupTest() {
suite.baseApp = baseapp.NewBaseApp(
"authz",
log.NewNopLogger(),
coretesting.NewNopLogger(),
testCtx.DB,
suite.encCfg.TxConfig.TxDecoder(),
)
@@ -68,7 +68,7 @@ func (suite *GenesisTestSuite) SetupTest() {
msr := suite.baseApp.MsgServiceRouter()
msr.SetInterfaceRegistry(suite.encCfg.InterfaceRegistry)
env := runtime.NewEnvironment(storeService, log.NewNopLogger(), runtime.EnvWithMsgRouterService(msr))
env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger(), runtime.EnvWithMsgRouterService(msr))
suite.keeper = keeper.NewKeeper(env, suite.encCfg.Codec, suite.accountKeeper)
}
x/authz/keeper/keeper_test.go
+3 -3
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/authz"
authzkeeper "cosmossdk.io/x/authz/keeper"
@@ -56,7 +56,7 @@ func (s *TestSuite) SetupTest() {
s.baseApp = baseapp.NewBaseApp(
"authz",
log.NewNopLogger(),
coretesting.NewNopLogger(),
testCtx.DB,
s.encCfg.TxConfig.TxDecoder(),
)
@@ -75,7 +75,7 @@ func (s *TestSuite) SetupTest() {
banktypes.RegisterInterfaces(s.encCfg.InterfaceRegistry)
banktypes.RegisterMsgServer(s.baseApp.MsgServiceRouter(), s.bankKeeper)
env := runtime.NewEnvironment(storeService, log.NewNopLogger(), runtime.EnvWithQueryRouterService(s.baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(s.baseApp.MsgServiceRouter()))
env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger(), runtime.EnvWithQueryRouterService(s.baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(s.baseApp.MsgServiceRouter()))
s.authzKeeper = authzkeeper.NewKeeper(env, s.encCfg.Codec, s.accountKeeper)
queryHelper := baseapp.NewQueryServerTestHelper(s.ctx, s.encCfg.InterfaceRegistry)
x/authz/migrations/v2/store_test.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
govtypes "cosmossdk.io/api/cosmos/gov/v1beta1"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/authz"
v2 "cosmossdk.io/x/authz/migrations/v2"
@@ -106,7 +106,7 @@ func TestMigration(t *testing.T) {
storeService := runtime.NewKVStoreService(authzKey)
store := storeService.OpenKVStore(ctx)
env := runtime.NewEnvironment(storeService, log.NewNopLogger())
env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger())
for _, g := range grants {
grant := g.authorization()
x/authz/module/abci_test.go
+3 -3
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
"cosmossdk.io/x/authz"
@@ -36,7 +36,7 @@ func TestExpiredGrantsQueue(t *testing.T) {
baseApp := baseapp.NewBaseApp(
"authz",
log.NewNopLogger(),
coretesting.NewNopLogger(),
testCtx.DB,
encCfg.TxConfig.TxDecoder(),
)
@@ -66,7 +66,7 @@ func TestExpiredGrantsQueue(t *testing.T) {
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec("cosmos")).AnyTimes()
env := runtime.NewEnvironment(storeService, log.NewNopLogger(), runtime.EnvWithQueryRouterService(baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(baseApp.MsgServiceRouter()))
env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger(), runtime.EnvWithQueryRouterService(baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(baseApp.MsgServiceRouter()))
authzKeeper := keeper.NewKeeper(env, encCfg.Codec, accountKeeper)
save := func(grantee sdk.AccAddress, exp *time.Time) {
x/bank/go.mod
+2
View File
@@ -166,6 +166,8 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)
require cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
require (
cosmossdk.io/schema v0.1.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
x/bank/keeper/collections_test.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
"cosmossdk.io/collections"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -31,7 +31,7 @@ func TestBankStateCompatibility(t *testing.T) {
ctx := testCtx.Ctx.WithHeaderInfo(header.Info{Time: time.Now()})
encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{})
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
// gomock initializations
ctrl := gomock.NewController(t)
x/bank/keeper/keeper_test.go
+3 -3
View File
@@ -15,7 +15,7 @@ import (
coreevent "cosmossdk.io/core/event"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
errorsmod "cosmossdk.io/errors"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
@@ -132,7 +132,7 @@ func (suite *KeeperTestSuite) SetupTest() {
ctx := testCtx.Ctx.WithHeaderInfo(header.Info{Time: time.Now()})
encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{})
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
ac := codectestutil.CodecOptions{}.GetAddressCodec()
addr, err := ac.BytesToString(accAddrs[4])
@@ -310,7 +310,7 @@ func (suite *KeeperTestSuite) TestPrependSendRestriction() {
}
func (suite *KeeperTestSuite) TestGetAuthority() {
env := runtime.NewEnvironment(runtime.NewKVStoreService(storetypes.NewKVStoreKey(banktypes.StoreKey)), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(storetypes.NewKVStoreKey(banktypes.StoreKey)), coretesting.NewNopLogger())
NewKeeperWithAuthority := func(authority string) keeper.BaseKeeper {
return keeper.NewBaseKeeper(
env,
x/circuit/go.mod
+1
View File
@@ -6,6 +6,7 @@ require (
cosmossdk.io/api v0.7.5
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/errors v1.0.1
cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc
x/circuit/keeper/genesis_test.go
+2 -2
View File
@@ -6,7 +6,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
"cosmossdk.io/x/circuit"
@@ -51,7 +51,7 @@ func (s *GenesisTestSuite) SetupTest() {
s.Require().NoError(err)
s.addrBytes = bz
s.keeper = keeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger()), s.cdc, authority, ac)
s.keeper = keeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger()), s.cdc, authority, ac)
}
func (s *GenesisTestSuite) TestInitExportGenesis() {
x/circuit/keeper/keeper_test.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/address"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
"cosmossdk.io/x/circuit"
@@ -45,7 +45,7 @@ func initFixture(t *testing.T) *fixture {
ac := addresscodec.NewBech32Codec("cosmos")
mockStoreKey := storetypes.NewKVStoreKey("test")
env := runtime.NewEnvironment(runtime.NewKVStoreService(mockStoreKey), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(mockStoreKey), coretesting.NewNopLogger())
authority, err := ac.BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
k := keeper.NewKeeper(env, encCfg.Codec, authority, ac)
x/consensus/go.mod
+1
View File
@@ -6,6 +6,7 @@ require (
cosmossdk.io/api v0.7.5
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc
github.com/cometbft/cometbft v1.0.0-rc1
x/consensus/keeper/keeper_test.go
+2 -2
View File
@@ -11,7 +11,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
consensusparamkeeper "cosmossdk.io/x/consensus/keeper"
"cosmossdk.io/x/consensus/types"
@@ -43,7 +43,7 @@ func (s *KeeperTestSuite) SetupTest(enabledFeatures bool) {
testCtx := testutil.DefaultContextWithDB(s.T(), key, storetypes.NewTransientStoreKey("transient_test"))
ctx := testCtx.Ctx.WithHeaderInfo(header.Info{Height: 5})
encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{})
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authority, err := codectestutil.CodecOptions{}.GetAddressCodec().BytesToString(address.Module("gov"))
s.Require().NoError(err)
x/distribution/go.mod
+1
View File
@@ -6,6 +6,7 @@ require (
cosmossdk.io/api v0.7.5
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/errors v1.0.1
cosmossdk.io/log v1.3.1
x/distribution/keeper/allocation_test.go
+4 -4
View File
@@ -11,7 +11,7 @@ import (
"cosmossdk.io/collections"
"cosmossdk.io/core/comet"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -53,7 +53,7 @@ func TestAllocateTokensToValidatorWithCommission(t *testing.T) {
accountKeeper := distrtestutil.NewMockAccountKeeper(ctrl)
poolKeeper := distrtestutil.NewMockPoolKeeper(ctrl)
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
valCodec := address.NewBech32Codec("cosmosvaloper")
@@ -125,7 +125,7 @@ func TestAllocateTokensToManyValidators(t *testing.T) {
accountKeeper.EXPECT().GetModuleAccount(gomock.Any(), "fee_collector").Return(feeCollectorAcc)
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec("cosmosvaloper")).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := cdcOpts.GetAddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -266,7 +266,7 @@ func TestAllocateTokensTruncation(t *testing.T) {
accountKeeper.EXPECT().GetModuleAccount(gomock.Any(), "fee_collector").Return(feeCollectorAcc)
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec("cosmosvaloper")).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := cdcOpts.GetAddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
x/distribution/keeper/delegation_test.go
+10 -10
View File
@@ -8,7 +8,7 @@ import (
"cosmossdk.io/collections"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -42,7 +42,7 @@ func TestCalculateRewardsBasic(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -156,7 +156,7 @@ func TestCalculateRewardsAfterSlash(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -273,7 +273,7 @@ func TestCalculateRewardsAfterManySlashes(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -411,7 +411,7 @@ func TestCalculateRewardsMultiDelegator(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -522,7 +522,7 @@ func TestWithdrawDelegationRewardsBasic(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -611,7 +611,7 @@ func TestCalculateRewardsAfterManySlashesInSameBlock(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -741,7 +741,7 @@ func TestCalculateRewardsMultiDelegatorMultiSlash(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -895,7 +895,7 @@ func TestCalculateRewardsMultiDelegatorMultWithdraw(t *testing.T) {
stakingKeeper.EXPECT().ValidatorAddressCodec().Return(address.NewBech32Codec(sdk.Bech32PrefixValAddr)).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
@@ -1110,7 +1110,7 @@ func Test100PercentCommissionReward(t *testing.T) {
stakingKeeper.EXPECT().BondDenom(gomock.Any()).Return("stake", nil).AnyTimes()
accountKeeper.EXPECT().AddressCodec().Return(address.NewBech32Codec(sdk.Bech32MainPrefix)).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
x/distribution/keeper/keeper_test.go
+2 -2
View File
@@ -8,7 +8,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -58,7 +58,7 @@ func initFixture(t *testing.T) (sdk.Context, []sdk.AccAddress, keeper.Keeper, de
bankKeeper.EXPECT().BlockedAddr(withdrawAddr).Return(false).AnyTimes()
bankKeeper.EXPECT().BlockedAddr(distrAcc.GetAddress()).Return(true).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
authorityAddr, err := cdcOpts.GetAddressCodec().BytesToString(authtypes.NewModuleAddress("gov"))
require.NoError(t, err)
x/distribution/migrations/v4/migrate_test.go
+2 -2
View File
@@ -5,7 +5,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/distribution"
v4 "cosmossdk.io/x/distribution/migrations/v4"
@@ -25,7 +25,7 @@ func TestMigration(t *testing.T) {
tKey := storetypes.NewTransientStoreKey("transient_test")
ctx := testutil.DefaultContext(storeKey, tKey)
env := runtime.NewEnvironment(storeService, log.NewNopLogger())
env := runtime.NewEnvironment(storeService, coretesting.NewNopLogger())
addr1 := secp256k1.GenPrivKey().PubKey().Address()
consAddr1 := sdk.ConsAddress(addr1)
x/epochs/go.mod
+1
View File
@@ -6,6 +6,7 @@ require (
cosmossdk.io/api v0.7.5
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/errors v1.0.1
cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc
x/epochs/keeper/keeper_test.go
+2 -2
View File
@@ -9,7 +9,7 @@ import (
"cosmossdk.io/core/appmodule"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
epochskeeper "cosmossdk.io/x/epochs/keeper"
"cosmossdk.io/x/epochs/types"
@@ -54,7 +54,7 @@ func Setup(t *testing.T) (sdk.Context, *epochskeeper.Keeper, appmodule.Environme
key := storetypes.NewKVStoreKey(types.StoreKey)
storeService := runtime.NewKVStoreService(key)
environment := runtime.NewEnvironment(storeService, log.NewNopLogger())
environment := runtime.NewEnvironment(storeService, coretesting.NewNopLogger())
testCtx := testutil.DefaultContextWithDB(t, key, storetypes.NewTransientStoreKey("transient_test"))
ctx := testCtx.Ctx.WithHeaderInfo(header.Info{Time: time.Now()})
encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{})
x/evidence/go.mod
+1
View File
@@ -6,6 +6,7 @@ require (
cosmossdk.io/api v0.7.5
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/errors v1.0.1
cosmossdk.io/math v1.3.0
x/evidence/keeper/keeper_test.go
+2 -2
View File
@@ -12,7 +12,7 @@ import (
"cosmossdk.io/collections"
coreaddress "cosmossdk.io/core/address"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/evidence"
"cosmossdk.io/x/evidence/exported"
@@ -90,7 +90,7 @@ type KeeperTestSuite struct {
func (suite *KeeperTestSuite) SetupTest() {
encCfg := moduletestutil.MakeTestEncodingConfig(codectestutil.CodecOptions{}, evidence.AppModule{})
key := storetypes.NewKVStoreKey(types.StoreKey)
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
tkey := storetypes.NewTransientStoreKey("evidence_transient_store")
testCtx := testutil.DefaultContextWithDB(suite.T(), key, tkey)
suite.ctx = testCtx.Ctx
x/feegrant/go.mod
+1
View File
@@ -6,6 +6,7 @@ require (
cosmossdk.io/api v0.7.5
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/errors v1.0.1
cosmossdk.io/math v1.3.0
x/feegrant/keeper/genesis_test.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/golang/mock/gomock"
"gotest.tools/v3/assert"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -52,7 +52,7 @@ func initFixture(t *testing.T) *genesisFixture {
return &genesisFixture{
ctx: testCtx.Ctx,
feegrantKeeper: keeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger()), encCfg.Codec, accountKeeper),
feegrantKeeper: keeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger()), encCfg.Codec, accountKeeper),
accountKeeper: accountKeeper,
}
}
x/feegrant/keeper/keeper_test.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
sdkmath "cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -62,7 +62,7 @@ func (suite *KeeperTestSuite) SetupTest() {
suite.encodedAddrs = append(suite.encodedAddrs, str)
}
suite.feegrantKeeper = keeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger()), encCfg.Codec, suite.accountKeeper)
suite.feegrantKeeper = keeper.NewKeeper(runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger()), encCfg.Codec, suite.accountKeeper)
suite.ctx = testCtx.Ctx
suite.msgSrvr = keeper.NewMsgServerImpl(suite.feegrantKeeper)
suite.atom = sdk.NewCoins(sdk.NewCoin("atom", sdkmath.NewInt(555)))
x/feegrant/migrations/v2/store_test.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
sdkmath "cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/feegrant"
@@ -89,7 +89,7 @@ func TestMigration(t *testing.T) {
}
ctx = ctx.WithHeaderInfo(header.Info{Time: now.Add(30 * time.Hour)})
require.NoError(t, v2.MigrateStore(ctx, runtime.NewEnvironment(runtime.NewKVStoreService(feegrantKey), log.NewNopLogger()), cdc))
require.NoError(t, v2.MigrateStore(ctx, runtime.NewEnvironment(runtime.NewKVStoreService(feegrantKey), coretesting.NewNopLogger()), cdc))
store = ctx.KVStore(feegrantKey)
require.NotNil(t, store.Get(v2.FeeAllowanceKey(granter1, grantee1)))
x/feegrant/module/abci_test.go
+2 -2
View File
@@ -7,7 +7,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
sdkmath "cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -49,7 +49,7 @@ func TestFeegrantPruning(t *testing.T) {
ac := address.NewBech32Codec("cosmos")
accountKeeper.EXPECT().AddressCodec().Return(ac).AnyTimes()
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), log.NewNopLogger())
env := runtime.NewEnvironment(runtime.NewKVStoreService(key), coretesting.NewNopLogger())
feegrantKeeper := keeper.NewKeeper(env, encCfg.Codec, accountKeeper)
x/gov/go.mod
+6 -7
View File
@@ -3,10 +3,10 @@ module cosmossdk.io/x/gov
go 1.22.2
require (
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
cosmossdk.io/api v0.7.5
cosmossdk.io/collections v0.4.0
cosmossdk.io/core v0.12.1-0.20231114100755-569e3ff6a0d7
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000
cosmossdk.io/depinject v1.0.0-alpha.4
cosmossdk.io/errors v1.0.1
cosmossdk.io/log v1.3.1 // indirect
@@ -14,11 +14,9 @@ require (
cosmossdk.io/store v1.1.1-0.20240418092142-896cdf1971bc
cosmossdk.io/x/auth v0.0.0-00010101000000-000000000000
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/x/protocolpool v0.0.0-20230925135524-a1bc045b3190
cosmossdk.io/x/staking v0.0.0-00010101000000-000000000000
github.com/chzyer/readline v1.5.1
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft v1.0.0-rc1
github.com/cosmos/cosmos-proto v1.0.0-beta.5
github.com/cosmos/cosmos-sdk v0.51.0
@@ -39,6 +37,8 @@ require (
require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/x/tx v0.13.3 // indirect
filippo.io/edwards25519 v1.1.0 // indirect
github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect
@@ -54,6 +54,7 @@ require (
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
github.com/cockroachdb/pebble v1.1.0 // indirect
github.com/cockroachdb/redact v1.1.5 // indirect
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
github.com/cometbft/cometbft-db v0.12.0 // indirect
github.com/cometbft/cometbft/api v1.0.0-rc.1 // indirect
github.com/cosmos/btcutil v1.0.5 // indirect
@@ -121,6 +122,7 @@ require (
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mtibben/percent v0.2.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/oasisprotocol/curve25519-voi v0.0.0-20230904125328-1f23a7beb09a // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
@@ -170,10 +172,7 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)
require (
cosmossdk.io/schema v0.1.1 // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
)
require cosmossdk.io/schema v0.1.1 // indirect
replace github.com/cosmos/cosmos-sdk => ../../.
x/gov/keeper/common_test.go
+5 -5
View File
@@ -9,7 +9,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/header"
"cosmossdk.io/core/log"
coretesting "cosmossdk.io/core/testing"
"cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
authtypes "cosmossdk.io/x/auth/types"
@@ -126,14 +126,14 @@ func setupGovKeeper(t *testing.T, expectations ...func(sdk.Context, mocks)) (
baseApp := baseapp.NewBaseApp(
"authz",
log.NewNopLogger(),
coretesting.NewNopLogger(),
testCtx.DB,
encCfg.TxConfig.TxDecoder(),
)
baseApp.SetCMS(testCtx.CMS)
baseApp.SetInterfaceRegistry(encCfg.InterfaceRegistry)
environment := runtime.NewEnvironment(storeService, log.NewNopLogger(), runtime.EnvWithQueryRouterService(baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(baseApp.MsgServiceRouter()))
environment := runtime.NewEnvironment(storeService, coretesting.NewNopLogger(), runtime.EnvWithQueryRouterService(baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(baseApp.MsgServiceRouter()))
// gomock initializations
ctrl := gomock.NewController(t)
@@ -192,14 +192,14 @@ func setupGovKeeperWithMaxVoteOptionsLen(t *testing.T, maxVoteOptionsLen uint64,
baseApp := baseapp.NewBaseApp(
"authz",
log.NewNopLogger(),
coretesting.NewNopLogger(),
testCtx.DB,
encCfg.TxConfig.TxDecoder(),
)
baseApp.SetCMS(testCtx.CMS)
baseApp.SetInterfaceRegistry(encCfg.InterfaceRegistry)
environment := runtime.NewEnvironment(storeService, log.NewNopLogger(), runtime.EnvWithQueryRouterService(baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(baseApp.MsgServiceRouter()))
environment := runtime.NewEnvironment(storeService, coretesting.NewNopLogger(), runtime.EnvWithQueryRouterService(baseApp.GRPCQueryRouter()), runtime.EnvWithMsgRouterService(baseApp.MsgServiceRouter()))
// gomock initializations
ctrl := gomock.NewController(t)
x/mint/go.mod
+1
View File
@@ -159,6 +159,7 @@ require (
require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/schema v0.1.1 // indirect
cosmossdk.io/x/consensus v0.0.0-00010101000000-000000000000 // indirect
github.com/cometbft/cometbft/api v1.0.0-rc.1 // indirect
x/nft/go.mod
+1
View File
@@ -25,6 +25,7 @@ require (
buf.build/gen/go/cometbft/cometbft/protocolbuffers/go v1.34.2-20240701160653-fedbb9acfd2f.2 // indirect
buf.build/gen/go/cosmos/gogo-proto/protocolbuffers/go v1.34.2-20240130113600-88ef6483f90f.2 // indirect
cosmossdk.io/collections v0.4.0 // indirect
cosmossdk.io/core/testing v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/schema v0.1.1 // indirect
cosmossdk.io/x/auth v0.0.0-00010101000000-000000000000 // indirect
cosmossdk.io/x/bank v0.0.0-20240226161501-23359a0b6d91 // indirect

Some files were not shown because too many files have changed in this diff Show More