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

refactor: remove header type from NewContext (#17426)

Browse Source 
Co-authored-by: marbar3778 <marbar3778@yahoo.com>
This commit is contained in:
Marko 2023-08-21 18:29:20 +02:00 committed by GitHub
parent dc62bd7ade
commit 393dcc1f2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
38 changed files with 79 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -99,6 +99,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
* (types) [#17348](https://github.com/cosmos/cosmos-sdk/pull/17348) Remove the `WrapServiceResult` function.
* The `*sdk.Result` returned by the msg server router will not contain the `.Data` field.
* (x/staking) [#17335](https://github.com/cosmos/cosmos-sdk/pull/17335) Remove usage of `"github.com/cosmos/cosmos-sdk/x/staking/types".Infraction_*` in favour of `"cosmossdk.io/api/cosmos/staking/v1beta1".Infraction_` in order to remove dependency between modules on staking
* (types) [#17426](https://github.com/cosmos/cosmos-sdk/pull/17426) `NewContext` does not take a `cmtproto.Header{}` any longer.
* `WithChainID` / `WithBlockHeight` / `WithBlockHeader` must be used to set values on the context
### CLI Breaking Changes

12
baseapp/abci.go
View File

@ -549,9 +549,8 @@ func (app *BaseApp) ProcessProposal(req *abci.RequestProcessProposal) (resp *abc
func (app *BaseApp) ExtendVote(_ context.Context, req *abci.RequestExtendVote) (resp *abci.ResponseExtendVote, err error) {
// Always reset state given that ExtendVote and VerifyVoteExtension can timeout
// and be called again in a subsequent round.
emptyHeader := cmtproto.Header{ChainID: app.chainID, Height: req.Height}
ms := app.cms.CacheMultiStore()
ctx := sdk.NewContext(ms, emptyHeader, false, app.logger).WithStreamingManager(app.streamingManager)
ctx := sdk.NewContext(ms, false, app.logger).WithStreamingManager(app.streamingManager).WithChainID(app.chainID).WithBlockHeight(req.Height)
if app.extendVote == nil {
return nil, errors.New("application ExtendVote handler not set")
@ -611,9 +610,8 @@ func (app *BaseApp) VerifyVoteExtension(req *abci.RequestVerifyVoteExtension) (r
return nil, errors.New("application VerifyVoteExtension handler not set")
}
emptyHeader := cmtproto.Header{ChainID: app.chainID, Height: req.Height}
ms := app.cms.CacheMultiStore()
ctx := sdk.NewContext(ms, emptyHeader, false, app.logger).WithStreamingManager(app.streamingManager)
ctx := sdk.NewContext(ms, false, app.logger).WithStreamingManager(app.streamingManager).WithChainID(app.chainID).WithBlockHeight(req.Height)
// If vote extensions are not enabled, as a safety precaution, we return an
// error.
@ -1016,7 +1014,7 @@ func (app *BaseApp) getContextForProposal(ctx sdk.Context, height int64) sdk.Con
ctx, _ = app.finalizeBlockState.ctx.CacheContext()
// clear all context data set during InitChain to avoid inconsistent behavior
ctx = ctx.WithBlockHeader(cmtproto.Header{}).WithHeaderInfo(coreheader.Info{})
ctx = ctx.WithHeaderInfo(coreheader.Info{}).WithBlockHeader(cmtproto.Header{})
return ctx
}
@ -1120,10 +1118,10 @@ func (app *BaseApp) CreateQueryContext(height int64, prove bool) (sdk.Context, e
}
// branch the commit multi-store for safety
ctx := sdk.NewContext(cacheMS, app.checkState.ctx.BlockHeader(), true, app.logger).
ctx := sdk.NewContext(cacheMS, true, app.logger).
WithMinGasPrices(app.minGasPrices).
WithBlockHeight(height).
WithGasMeter(storetypes.NewGasMeter(app.queryGasLimit))
WithGasMeter(storetypes.NewGasMeter(app.queryGasLimit)).WithBlockHeader(app.checkState.ctx.BlockHeader())
if height != lastBlockHeight {
rms, ok := app.cms.(*rootmulti.Store)

2
baseapp/baseapp.go
View File

@ -474,7 +474,7 @@ func (app *BaseApp) setState(mode execMode, header cmtproto.Header) {
ms := app.cms.CacheMultiStore()
baseState := &state{
ms: ms,
ctx: sdk.NewContext(ms, header, false, app.logger).WithStreamingManager(app.streamingManager),
ctx: sdk.NewContext(ms, false, app.logger).WithStreamingManager(app.streamingManager).WithBlockHeader(header),
}
switch mode {

8
baseapp/test_helpers.go
View File

@ -53,11 +53,11 @@ func (app *BaseApp) SimTxFinalizeBlock(txEncoder sdk.TxEncoder, tx sdk.Tx) (sdk.
// NewContextLegacy returns a new sdk.Context with the provided header
func (app *BaseApp) NewContextLegacy(isCheckTx bool, header cmtproto.Header) sdk.Context {
if isCheckTx {
return sdk.NewContext(app.checkState.ms, header, true, app.logger).
WithMinGasPrices(app.minGasPrices)
return sdk.NewContext(app.checkState.ms, true, app.logger).
WithMinGasPrices(app.minGasPrices).WithBlockHeader(header)
}
return sdk.NewContext(app.finalizeBlockState.ms, header, false, app.logger)
return sdk.NewContext(app.finalizeBlockState.ms, false, app.logger).WithBlockHeader(header)
}
// NewContext returns a new sdk.Context with a empty header
@ -66,7 +66,7 @@ func (app *BaseApp) NewContext(isCheckTx bool) sdk.Context {
}
func (app *BaseApp) NewUncachedContext(isCheckTx bool, header cmtproto.Header) sdk.Context {
return sdk.NewContext(app.cms, header, isCheckTx, app.logger)
return sdk.NewContext(app.cms, isCheckTx, app.logger).WithBlockHeader(header)
}
func (app *BaseApp) GetContextForFinalizeBlock(txBytes []byte) sdk.Context {

3
tests/integration/bank/keeper/deterministic_test.go
View File

@ -3,7 +3,6 @@ package keeper_test
import (
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
"pgregory.net/rapid"
@ -70,7 +69,7 @@ func initDeterministicFixture(t *testing.T) *deterministicFixture {
logger := log.NewTestLogger(t)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtproto.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
authority := authtypes.NewModuleAddress("gov")

2
tests/integration/distribution/keeper/msg_server_test.go
View File

@ -68,7 +68,7 @@ func initFixture(tb testing.TB) *fixture {
logger := log.NewTestLogger(tb)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, types.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
authority := authtypes.NewModuleAddress("gov")

3
tests/integration/evidence/keeper/infraction_test.go
View File

@ -8,7 +8,6 @@ import (
"time"
abci "github.com/cometbft/cometbft/abci/types"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
"cosmossdk.io/collections"
@ -90,7 +89,7 @@ func initFixture(tb testing.TB) *fixture {
logger := log.NewTestLogger(tb)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtproto.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
authority := authtypes.NewModuleAddress("gov")

3
tests/integration/gov/keeper/keeper_test.go
View File

@ -3,7 +3,6 @@ package keeper_test
import (
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
"cosmossdk.io/core/appmodule"
@ -58,7 +57,7 @@ func initFixture(tb testing.TB) *fixture {
logger := log.NewTestLogger(tb)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtproto.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
authority := authtypes.NewModuleAddress(types.ModuleName)

3
tests/integration/slashing/keeper/keeper_test.go
View File

@ -4,7 +4,6 @@ import (
"testing"
"time"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
"gotest.tools/v3/assert"
@ -60,7 +59,7 @@ func initFixture(tb testing.TB) *fixture {
logger := log.NewTestLogger(tb)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtproto.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
authority := authtypes.NewModuleAddress("gov")

3
tests/integration/staking/keeper/common_test.go
View File

@ -4,7 +4,6 @@ import (
"math/big"
"testing"
cmtprototypes "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
"cosmossdk.io/core/appmodule"
@ -103,7 +102,7 @@ func initFixture(tb testing.TB) *fixture {
logger := log.NewTestLogger(tb)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtprototypes.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
authority := authtypes.NewModuleAddress("gov")

2
tests/integration/staking/keeper/deterministic_test.go
View File

@ -74,7 +74,7 @@ func initDeterministicFixture(t *testing.T) *deterministicFixture {
logger := log.NewTestLogger(t)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtproto.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
authority := authtypes.NewModuleAddress("gov")

7
testutil/context.go
View File

@ -4,7 +4,6 @@ import (
"testing"
"time"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
dbm "github.com/cosmos/cosmos-db"
"github.com/stretchr/testify/assert"
@ -26,7 +25,7 @@ func DefaultContext(key, tkey storetypes.StoreKey) sdk.Context {
if err != nil {
panic(err)
}
ctx := sdk.NewContext(cms, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(cms, false, log.NewNopLogger())
return ctx
}
@ -58,7 +57,7 @@ func DefaultContextWithKeys(
panic(err)
}
return sdk.NewContext(cms, cmtproto.Header{}, false, log.NewNopLogger())
return sdk.NewContext(cms, false, log.NewNopLogger())
}
type TestContext struct {
@ -76,7 +75,7 @@ func DefaultContextWithDB(tb testing.TB, key, tkey storetypes.StoreKey) TestCont
err := cms.LoadLatestVersion()
assert.NoError(tb, err)
ctx := sdk.NewContext(cms, cmtproto.Header{Time: time.Now()}, false, log.NewNopLogger())
ctx := sdk.NewContext(cms, false, log.NewNopLogger()).WithBlockTime(time.Now())
return TestContext{ctx, db, cms}
}

5
testutil/integration/example_test.go
View File

@ -4,7 +4,6 @@ import (
"fmt"
"io"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/google/go-cmp/cmp"
"cosmossdk.io/core/appmodule"
@ -38,7 +37,7 @@ func Example() {
logger := log.NewNopLogger()
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtproto.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
accountKeeper := authkeeper.NewAccountKeeper(
encodingCfg.Codec,
@ -127,7 +126,7 @@ func Example_oneModule() {
logger := log.NewLogger(io.Discard)
cms := integration.CreateMultiStore(keys, logger)
newCtx := sdk.NewContext(cms, cmtproto.Header{}, true, logger)
newCtx := sdk.NewContext(cms, true, logger)
accountKeeper := authkeeper.NewAccountKeeper(
encodingCfg.Codec,

18
types/context.go
View File

@ -121,14 +121,14 @@ func (c Context) Err() error {
}
// create a new context
func NewContext(ms storetypes.MultiStore, header cmtproto.Header, isCheckTx bool, logger log.Logger) Context {
// https://github.com/gogo/protobuf/issues/519
header.Time = header.Time.UTC()
func NewContext(ms storetypes.MultiStore, isCheckTx bool, logger log.Logger) Context {
h := cmtproto.Header{}
h.Time = h.Time.UTC()
return Context{
baseCtx: context.Background(),
ms: ms,
header: header,
chainID: header.ChainID,
header: h,
chainID: h.ChainID,
checkTx: isCheckTx,
logger: logger,
gasMeter: storetypes.NewInfiniteGasMeter(),
@ -136,6 +136,9 @@ func NewContext(ms storetypes.MultiStore, header cmtproto.Header, isCheckTx bool
eventManager: NewEventManager(),
kvGasConfig: storetypes.KVGasConfig(),
transientKVGasConfig: storetypes.TransientGasConfig(),
headerInfo: header.Info{
Time: h.Time.UTC(),
},
}
}
@ -156,6 +159,9 @@ func (c Context) WithBlockHeader(header cmtproto.Header) Context {
// https://github.com/gogo/protobuf/issues/519
header.Time = header.Time.UTC()
c.header = header
// when calling withBlockheader on a new context chainID in the struct is empty
c.chainID = header.ChainID
return c
}
@ -303,7 +309,7 @@ func (c Context) WithCometInfo(cometInfo comet.BlockInfo) Context {
// WithHeaderInfo returns a Context with an updated header info
func (c Context) WithHeaderInfo(headerInfo header.Info) Context {
// Settime to UTC
// Set time to UTC
headerInfo.Time = headerInfo.Time.UTC()
c.headerInfo = headerInfo
return c

13
types/context_test.go
View File

@ -84,7 +84,6 @@ func (s *contextTestSuite) TestContextWithCustom() {
ctrl := gomock.NewController(s.T())
s.T().Cleanup(ctrl.Finish)
header := cmtproto.Header{}
height := int64(1)
chainid := "chainid"
ischeck := true
@ -97,8 +96,8 @@ func (s *contextTestSuite) TestContextWithCustom() {
headerHash := []byte("headerHash")
zeroGasCfg := storetypes.GasConfig{}
ctx = types.NewContext(nil, header, ischeck, logger)
s.Require().Equal(header, ctx.BlockHeader())
ctx = types.NewContext(nil, ischeck, logger)
s.Require().Equal(cmtproto.Header{}, ctx.BlockHeader())
ctx = ctx.
WithBlockHeight(height).
@ -152,7 +151,7 @@ func (s *contextTestSuite) TestContextHeader() {
addr := secp256k1.GenPrivKey().PubKey().Address()
proposer := types.ConsAddress(addr)
ctx = types.NewContext(nil, cmtproto.Header{}, false, nil)
ctx = types.NewContext(nil, false, nil)
ctx = ctx.
WithBlockHeight(height).
@ -166,7 +165,7 @@ func (s *contextTestSuite) TestContextHeader() {
func (s *contextTestSuite) TestWithBlockTime() {
now := time.Now()
ctx := types.NewContext(nil, cmtproto.Header{}, false, nil)
ctx := types.NewContext(nil, false, nil)
ctx = ctx.WithBlockTime(now)
cmttime2 := cmttime.Canonical(now)
s.Require().Equal(ctx.BlockTime(), cmttime2)
@ -215,7 +214,7 @@ func (s *contextTestSuite) TestContextHeaderClone() {
for name, tc := range cases {
tc := tc
s.T().Run(name, func(t *testing.T) {
ctx := types.NewContext(nil, tc.h, false, nil)
ctx := types.NewContext(nil, false, nil).WithBlockHeader(tc.h)
s.Require().Equal(tc.h.Height, ctx.BlockHeight())
s.Require().Equal(tc.h.Time.UTC(), ctx.BlockTime())
@ -229,7 +228,7 @@ func (s *contextTestSuite) TestContextHeaderClone() {
}
func (s *contextTestSuite) TestUnwrapSDKContext() {
sdkCtx := types.NewContext(nil, cmtproto.Header{}, false, nil)
sdkCtx := types.NewContext(nil, false, nil)
ctx := types.WrapSDKContext(sdkCtx)
sdkCtx2 := types.UnwrapSDKContext(ctx)
s.Require().Equal(sdkCtx, sdkCtx2)

5
types/mempool/mempool_test.go
View File

@ -5,7 +5,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
"github.com/stretchr/testify/suite"
protov2 "google.golang.org/protobuf/proto"
@ -132,7 +131,7 @@ func fetchTxs(iterator mempool.Iterator, maxBytes int64) []sdk.Tx {
func (s *MempoolTestSuite) TestDefaultMempool() {
t := s.T()
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 10)
txCount := 1000
var txs []testTx
@ -224,7 +223,7 @@ func TestMempoolTestSuite(t *testing.T) {
}
func (s *MempoolTestSuite) TestSampleTxs() {
ctxt := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctxt := sdk.NewContext(nil, false, log.NewNopLogger())
t := s.T()
s.resetMempool()
mp := s.mempool

15
types/mempool/priority_nonce_test.go
View File

@ -7,7 +7,6 @@ import (
"testing"
"time"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
"cosmossdk.io/log"
@ -62,7 +61,7 @@ func TestOutOfOrder(t *testing.T) {
func (s *MempoolTestSuite) TestPriorityNonceTxOrder() {
t := s.T()
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
sa := accounts[0].Address
sb := accounts[1].Address
@ -260,7 +259,7 @@ func (s *MempoolTestSuite) TestPriorityNonceTxOrder() {
}
func (s *MempoolTestSuite) TestPriorityTies() {
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 3)
sa := accounts[0].Address
sb := accounts[1].Address
@ -383,7 +382,7 @@ func (s *MempoolTestSuite) TestRandomGeneratedTxs() {
)
t := s.T()
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
seed := time.Now().UnixNano()
t.Logf("running with seed: %d", seed)
@ -419,7 +418,7 @@ func (s *MempoolTestSuite) TestRandomWalkTxs() {
s.mempool = mempool.DefaultPriorityMempool()
t := s.T()
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
seed := time.Now().UnixNano()
// interesting failing seeds:
@ -592,7 +591,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, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
accA := accounts[0].Address
accB := accounts[1].Address
@ -622,7 +621,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, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
sa := accounts[0].Address
sb := accounts[1].Address
@ -695,7 +694,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, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
sa := accounts[0].Address
txs := []testTx{

3
types/mempool/sender_nonce_property_test.go
View File

@ -3,7 +3,6 @@ package mempool_test
import (
"sort"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
"pgregory.net/rapid"
@ -34,7 +33,7 @@ func AddressGenerator(t *rapid.T) *rapid.Generator[sdk.AccAddress] {
}
func testMempoolProperties(t *rapid.T) {
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
mp := mempool.NewSenderNonceMempool()
genMultipleAddress := rapid.SliceOfNDistinct(AddressGenerator(t), 1, 10, func(acc sdk.AccAddress) string {

7
types/mempool/sender_nonce_test.go
View File

@ -5,7 +5,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
"cosmossdk.io/log"
@ -17,7 +16,7 @@ import (
func (s *MempoolTestSuite) TestTxOrder() {
t := s.T()
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 5)
sa := accounts[0].Address
sb := accounts[1].Address
@ -141,7 +140,7 @@ func (s *MempoolTestSuite) TestTxOrder() {
func (s *MempoolTestSuite) TestMaxTx() {
t := s.T()
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
mp := mempool.NewSenderNonceMempool(mempool.SenderNonceMaxTxOpt(1))
@ -171,7 +170,7 @@ func (s *MempoolTestSuite) TestMaxTx() {
func (s *MempoolTestSuite) TestTxNotFoundOnSender() {
t := s.T()
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
accounts := simtypes.RandomAccounts(rand.New(rand.NewSource(0)), 1)
mp := mempool.NewSenderNonceMempool()

9
types/module/module_test.go
View File

@ -8,7 +8,6 @@ import (
"testing"
abci "github.com/cometbft/cometbft/abci/types"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/golang/mock/gomock"
"github.com/spf13/cobra"
"github.com/stretchr/testify/require"
@ -240,7 +239,7 @@ func TestManager_InitGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 3, len(mm.Modules))
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
interfaceRegistry := types.NewInterfaceRegistry()
cdc := codec.NewProtoCodec(interfaceRegistry)
genesisData := map[string]json.RawMessage{"module1": json.RawMessage(`{"key": "value"}`)}
@ -284,7 +283,7 @@ func TestManager_ExportGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 3, len(mm.Modules))
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
interfaceRegistry := types.NewInterfaceRegistry()
cdc := codec.NewProtoCodec(interfaceRegistry)
mockAppModule1.EXPECT().ExportGenesis(gomock.Eq(ctx), gomock.Eq(cdc)).AnyTimes().Return(json.RawMessage(`{"key1": "value1"}`))
@ -370,7 +369,7 @@ func TestCoreAPIManager_InitGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 1, len(mm.Modules))
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
interfaceRegistry := types.NewInterfaceRegistry()
cdc := codec.NewProtoCodec(interfaceRegistry)
genesisData := map[string]json.RawMessage{"module1": json.RawMessage(`{"key": "value"}`)}
@ -394,7 +393,7 @@ func TestCoreAPIManager_ExportGenesis(t *testing.T) {
require.NotNil(t, mm)
require.Equal(t, 2, len(mm.Modules))
ctx := sdk.NewContext(nil, cmtproto.Header{}, false, log.NewNopLogger())
ctx := sdk.NewContext(nil, false, log.NewNopLogger())
interfaceRegistry := types.NewInterfaceRegistry()
cdc := codec.NewProtoCodec(interfaceRegistry)
want := map[string]json.RawMessage{

2
x/auth/ante/testutil_test.go
View File

@ -65,7 +65,7 @@ func SetupTestSuite(t *testing.T, isCheckTx bool) *AnteTestSuite {
key := storetypes.NewKVStoreKey(types.StoreKey)
testCtx := testutil.DefaultContextWithDB(t, key, storetypes.NewTransientStoreKey("transient_test"))
suite.ctx = testCtx.Ctx.WithIsCheckTx(isCheckTx).WithBlockHeight(1) // app.BaseApp.NewContext(isCheckTx, cmtproto.Header{}).WithBlockHeight(1)
suite.ctx = testCtx.Ctx.WithIsCheckTx(isCheckTx).WithBlockHeight(1)
suite.encCfg = moduletestutil.MakeTestEncodingConfig(auth.AppModuleBasic{})
maccPerms := map[string][]string{

3
x/auth/simulation/proposals_test.go
View File

@ -4,7 +4,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -19,7 +18,7 @@ func TestProposalMsgs(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalMsgs function

3
x/authz/module/abci_test.go
View File

@ -4,7 +4,6 @@ import (
"testing"
"time"
"github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/require"
@ -31,7 +30,7 @@ func TestExpiredGrantsQueue(t *testing.T) {
storeService := runtime.NewKVStoreService(key)
testCtx := testutil.DefaultContextWithDB(t, key, storetypes.NewTransientStoreKey("transient_test"))
encCfg := moduletestutil.MakeTestEncodingConfig(authzmodule.AppModuleBasic{})
ctx := testCtx.Ctx.WithBlockHeader(types.Header{})
ctx := testCtx.Ctx
baseApp := baseapp.NewBaseApp(
"authz",

3
x/bank/simulation/proposals_test.go
View File

@ -4,7 +4,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -19,7 +18,7 @@ func TestProposalMsgs(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalMsgs function

3
x/circuit/ante/circuit_test.go
View File

@ -5,7 +5,6 @@ import (
"testing"
abci "github.com/cometbft/cometbft/abci/types"
cmproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
storetypes "cosmossdk.io/store/types"
@ -47,7 +46,7 @@ func initFixture(t *testing.T) *fixture {
WithClient(clitestutil.NewMockCometRPC(abci.ResponseQuery{}))
return &fixture{
ctx: testutil.DefaultContextWithDB(t, mockStoreKey, storetypes.NewTransientStoreKey("transient_test")).Ctx.WithBlockHeader(cmproto.Header{}),
ctx: testutil.DefaultContextWithDB(t, mockStoreKey, storetypes.NewTransientStoreKey("transient_test")).Ctx,
mockStoreKey: mockStoreKey,
mockMsgURL: "test",
mockclientCtx: mockclientCtx,

3
x/circuit/keeper/keeper_test.go
View File

@ -5,7 +5,6 @@ import (
context "context"
"testing"
cmproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
"cosmossdk.io/core/address"
@ -50,7 +49,7 @@ func initFixture(t *testing.T) *fixture {
require.NoError(t, err)
return &fixture{
ctx: testutil.DefaultContextWithDB(t, mockStoreKey, storetypes.NewTransientStoreKey("transient_test")).Ctx.WithBlockHeader(cmproto.Header{}),
ctx: testutil.DefaultContextWithDB(t, mockStoreKey, storetypes.NewTransientStoreKey("transient_test")).Ctx,
keeper: k,
mockAddr: bz,
mockPerms: types.Permissions{

2
x/consensus/keeper/keeper_test.go
View File

@ -30,7 +30,7 @@ type KeeperTestSuite struct {
func (s *KeeperTestSuite) SetupTest() {
key := storetypes.NewKVStoreKey(consensusparamkeeper.StoreKey)
testCtx := testutil.DefaultContextWithDB(s.T(), key, storetypes.NewTransientStoreKey("transient_test"))
ctx := testCtx.Ctx.WithBlockHeader(cmtproto.Header{})
ctx := testCtx.Ctx
encCfg := moduletestutil.MakeTestEncodingConfig()
storeService := runtime.NewKVStoreService(key)

3
x/distribution/simulation/proposals_test.go
View File

@ -4,7 +4,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
sdkmath "cosmossdk.io/math"
@ -21,7 +20,7 @@ func TestProposalMsgs(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalMsgs function

5
x/gov/simulation/proposals_test.go
View File

@ -4,7 +4,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -17,7 +16,7 @@ func TestProposalMsgs(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalMsgs function
@ -39,7 +38,7 @@ func TestProposalContents(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalContents function

3
x/group/keeper/invariants_test.go
View File

@ -3,7 +3,6 @@ package keeper_test
import (
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
dbm "github.com/cosmos/cosmos-db"
"github.com/stretchr/testify/suite"
@ -42,7 +41,7 @@ func (s *invariantTestSuite) SetupSuite() {
cms := store.NewCommitMultiStore(db, log.NewNopLogger(), metrics.NewNoOpMetrics())
cms.MountStoreWithDB(key, storetypes.StoreTypeIAVL, db)
_ = cms.LoadLatestVersion()
sdkCtx := sdk.NewContext(cms, cmtproto.Header{}, false, log.NewNopLogger())
sdkCtx := sdk.NewContext(cms, false, log.NewNopLogger())
s.ctx = sdkCtx
s.cdc = cdc

3
x/mint/simulation/proposals_test.go
View File

@ -4,7 +4,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
sdkmath "cosmossdk.io/math"
@ -21,7 +20,7 @@ func TestProposalMsgs(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalMsgs function

5
x/nft/keeper/keeper_test.go
View File

@ -2,9 +2,8 @@ package keeper_test
import (
"testing"
"time"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
cmttime "github.com/cometbft/cometbft/types/time"
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/suite"
@ -55,7 +54,7 @@ func (s *TestSuite) SetupTest() {
key := storetypes.NewKVStoreKey(nft.StoreKey)
storeService := runtime.NewKVStoreService(key)
testCtx := testutil.DefaultContextWithDB(s.T(), key, storetypes.NewTransientStoreKey("transient_test"))
ctx := testCtx.Ctx.WithBlockHeader(cmtproto.Header{Time: cmttime.Now()})
ctx := testCtx.Ctx.WithBlockTime(time.Now().Round(0).UTC())
// gomock initializations
ctrl := gomock.NewController(s.T())

3
x/params/simulation/operations_test.go
View File

@ -5,7 +5,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -43,7 +42,7 @@ func TestSimulateParamChangeProposalContent(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
paramChangePool := []simtypes.LegacyParamChange{MockParamChange{1}, MockParamChange{2}, MockParamChange{3}}

3
x/params/simulation/proposals_test.go
View File

@ -4,7 +4,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -18,7 +17,7 @@ func TestProposalContents(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
paramChangePool := []simtypes.LegacyParamChange{MockParamChange{1}, MockParamChange{2}, MockParamChange{3}}

3
x/params/types/subspace_test.go
View File

@ -6,7 +6,6 @@ import (
"testing"
"time"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
dbm "github.com/cosmos/cosmos-db"
"github.com/stretchr/testify/suite"
@ -44,7 +43,7 @@ func (suite *SubspaceTestSuite) SetupTest() {
suite.amino = encodingConfig.Amino
ss := types.NewSubspace(suite.cdc, suite.amino, key, tkey, "testsubspace")
suite.ctx = sdk.NewContext(ms, cmtproto.Header{}, false, log.NewNopLogger())
suite.ctx = sdk.NewContext(ms, false, log.NewNopLogger())
suite.ss = ss.WithKeyTable(paramKeyTable())
}

3
x/simulation/params_test.go
View File

@ -5,7 +5,6 @@ import (
"math/rand"
"testing"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -39,7 +38,7 @@ func TestNewWeightedProposalContent(t *testing.T) {
require.Equal(t, key, pContent.AppParamsKey())
require.Equal(t, weight, pContent.DefaultWeight())
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
require.Equal(t, content, pContent.ContentSimulatorFn()(nil, ctx, nil))
}

3
x/slashing/simulation/proposals_test.go
View File

@ -5,7 +5,6 @@ import (
"testing"
"time"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
sdkmath "cosmossdk.io/math"
@ -22,7 +21,7 @@ func TestProposalMsgs(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalMsgs function

3
x/staking/simulation/proposals_test.go
View File

@ -5,7 +5,6 @@ import (
"testing"
"time"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"gotest.tools/v3/assert"
sdkmath "cosmossdk.io/math"
@ -22,7 +21,7 @@ func TestProposalMsgs(t *testing.T) {
s := rand.NewSource(1)
r := rand.New(s)
ctx := sdk.NewContext(nil, cmtproto.Header{}, true, nil)
ctx := sdk.NewContext(nil, true, nil)
accounts := simtypes.RandomAccounts(r, 3)
// execute ProposalMsgs function