diff --git a/server/v2/cometbft/abci_test.go b/server/v2/cometbft/abci_test.go index 6fdfc331ea..1d57e97c0f 100644 --- a/server/v2/cometbft/abci_test.go +++ b/server/v2/cometbft/abci_test.go @@ -15,7 +15,6 @@ import ( abci "github.com/cometbft/cometbft/abci/types" abciproto "github.com/cometbft/cometbft/api/cometbft/abci/v1" v1 "github.com/cometbft/cometbft/api/cometbft/types/v1" - "github.com/cosmos/gogoproto/proto" gogoproto "github.com/cosmos/gogoproto/proto" gogotypes "github.com/cosmos/gogoproto/types" "github.com/stretchr/testify/require" @@ -65,11 +64,11 @@ var ( func getQueryRouterBuilder[T any, PT interface { *T - proto.Message + gogoproto.Message }, U any, UT interface { *U - proto.Message + gogoproto.Message }]( t *testing.T, handler func(ctx context.Context, msg PT) (UT, error), @@ -77,7 +76,7 @@ func getQueryRouterBuilder[T any, PT interface { t.Helper() queryRouterBuilder := stf.NewMsgRouterBuilder() err := queryRouterBuilder.RegisterHandler( - proto.MessageName(PT(new(T))), + gogoproto.MessageName(PT(new(T))), func(ctx context.Context, msg transaction.Msg) (msgResp transaction.Msg, err error) { typedReq := msg.(PT) typedResp, err := handler(ctx, typedReq) @@ -107,7 +106,7 @@ func getMsgRouterBuilder[T any, PT interface { t.Helper() msgRouterBuilder := stf.NewMsgRouterBuilder() err := msgRouterBuilder.RegisterHandler( - proto.MessageName(PT(new(T))), + gogoproto.MessageName(PT(new(T))), func(ctx context.Context, msg transaction.Msg) (msgResp transaction.Msg, err error) { typedReq := msg.(PT) typedResp, err := handler(ctx, typedReq) @@ -821,18 +820,19 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock. return typedResp, nil } - queryRouterBuilder.RegisterHandler( - proto.MessageName(&testdata.SayHelloRequest{}), + err := queryRouterBuilder.RegisterHandler( + gogoproto.MessageName(&testdata.SayHelloRequest{}), helloFooHandler, ) + require.NoError(t, err) - queryHandler[proto.MessageName(&testdata.SayHelloRequest{})] = appmodulev2.Handler{ + queryHandler[gogoproto.MessageName(&testdata.SayHelloRequest{})] = appmodulev2.Handler{ Func: helloFooHandler, MakeMsg: func() transaction.Msg { - return reflect.New(gogoproto.MessageType(proto.MessageName(&testdata.SayHelloRequest{})).Elem()).Interface().(transaction.Msg) + return reflect.New(gogoproto.MessageType(gogoproto.MessageName(&testdata.SayHelloRequest{})).Elem()).Interface().(transaction.Msg) }, MakeMsgResp: func() transaction.Msg { - return reflect.New(gogoproto.MessageType(proto.MessageName(&testdata.SayHelloResponse{})).Elem()).Interface().(transaction.Msg) + return reflect.New(gogoproto.MessageType(gogoproto.MessageName(&testdata.SayHelloResponse{})).Elem()).Interface().(transaction.Msg) }, } @@ -897,7 +897,7 @@ func setUpConsensus(t *testing.T, gasLimit uint64, mempool mempool.Mempool[mock. TxCodec: mock.TxCodec{}, }, chainID: "test", - getProtoRegistry: sync.OnceValues(proto.MergedRegistry), + getProtoRegistry: sync.OnceValues(gogoproto.MergedRegistry), queryHandlersMap: queryHandler, addrPeerFilter: addrPeerFilter, idPeerFilter: idPeerFilter, diff --git a/server/v2/cometbft/utils.go b/server/v2/cometbft/utils.go index 700a84b247..b5c9b76d6f 100644 --- a/server/v2/cometbft/utils.go +++ b/server/v2/cometbft/utils.go @@ -15,7 +15,6 @@ import ( cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" cryptoenc "github.com/cometbft/cometbft/crypto/encoding" protoio "github.com/cosmos/gogoproto/io" - "github.com/cosmos/gogoproto/proto" gogoproto "github.com/cosmos/gogoproto/proto" gogoany "github.com/cosmos/gogoproto/types/any" "google.golang.org/grpc/codes" @@ -516,7 +515,7 @@ func ValidateVoteExtensions[T transaction.Tx]( return nil } - marshalDelimitedFn := func(msg proto.Message) ([]byte, error) { + marshalDelimitedFn := func(msg gogoproto.Message) ([]byte, error) { var buf bytes.Buffer if err := protoio.NewDelimitedWriter(&buf).WriteMsg(msg); err != nil { return nil, err diff --git a/tests/integration/accounts/lockup/utils.go b/tests/integration/accounts/lockup/utils.go index d92586f1ac..6d7cc353b1 100644 --- a/tests/integration/accounts/lockup/utils.go +++ b/tests/integration/accounts/lockup/utils.go @@ -91,7 +91,7 @@ func (s *IntegrationTestSuite) setupStakingParams(ctx sdk.Context, app *simapp.S require.NoError(s.T(), err) // update unbonding time - params.UnbondingTime = time.Duration(time.Second * 10) + params.UnbondingTime = time.Second * 10 err = app.StakingKeeper.Params.Set(ctx, params) require.NoError(s.T(), err) } diff --git a/tests/integration/distribution/genesis_test.go b/tests/integration/distribution/genesis_test.go index a113341496..a7612713ae 100644 --- a/tests/integration/distribution/genesis_test.go +++ b/tests/integration/distribution/genesis_test.go @@ -4,22 +4,23 @@ import ( "encoding/json" "testing" + abci "github.com/cometbft/cometbft/api/cometbft/abci/v1" + "github.com/stretchr/testify/suite" + corestore "cosmossdk.io/core/store" coretesting "cosmossdk.io/core/testing" "cosmossdk.io/depinject" "cosmossdk.io/log" sdkmath "cosmossdk.io/math" + bankkeeper "cosmossdk.io/x/bank/keeper" "cosmossdk.io/x/distribution/keeper" "cosmossdk.io/x/distribution/types" stakingkeeper "cosmossdk.io/x/staking/keeper" - abci "github.com/cometbft/cometbft/api/cometbft/abci/v1" + "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/runtime" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/stretchr/testify/suite" - - bankkeeper "cosmossdk.io/x/bank/keeper" _ "github.com/cosmos/cosmos-sdk/x/auth" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" ) diff --git a/x/accounts/defaults/lockup/continuous_locking_account_test.go b/x/accounts/defaults/lockup/continuous_locking_account_test.go index 097c335db5..28d4cc9e06 100644 --- a/x/accounts/defaults/lockup/continuous_locking_account_test.go +++ b/x/accounts/defaults/lockup/continuous_locking_account_test.go @@ -76,6 +76,8 @@ func TestContinuousAccountDelegate(t *testing.T) { } func TestContinuousAccountUndelegate(t *testing.T) { + const valAddress = "val_address" + ctx, ss := newMockContext(t) sdkCtx := sdk.NewContext(nil, true, log.NewNopLogger()).WithContext(ctx).WithHeaderInfo(header.Info{ Time: time.Now(), @@ -85,7 +87,7 @@ func TestContinuousAccountUndelegate(t *testing.T) { // Delegate first _, err := acc.Delegate(sdkCtx, &lockuptypes.MsgDelegate{ Sender: "owner", - ValidatorAddress: "val_address", + ValidatorAddress: valAddress, Amount: sdk.NewCoin("test", math.NewInt(1)), }) require.NoError(t, err) @@ -97,21 +99,21 @@ func TestContinuousAccountUndelegate(t *testing.T) { // Undelegate _, err = acc.Undelegate(sdkCtx, &lockuptypes.MsgUndelegate{ Sender: "owner", - ValidatorAddress: "val_address", + ValidatorAddress: valAddress, Amount: sdk.NewCoin("test", math.NewInt(1)), }) require.NoError(t, err) - entries, err := acc.UnbondEntries.Get(sdkCtx, "val_address") + entries, err := acc.UnbondEntries.Get(sdkCtx, valAddress) require.NoError(t, err) require.Len(t, entries.Entries, 1) require.True(t, entries.Entries[0].Amount.Amount.Equal(math.NewInt(1))) - require.True(t, entries.Entries[0].ValidatorAddress == "val_address") + require.True(t, entries.Entries[0].ValidatorAddress == valAddress) err = acc.checkUnbondingEntriesMature(sdkCtx) require.NoError(t, err) - _, err = acc.UnbondEntries.Get(sdkCtx, "val_address") + _, err = acc.UnbondEntries.Get(sdkCtx, valAddress) require.Error(t, err) delLocking, err = acc.DelegatedLocking.Get(ctx, "test") diff --git a/x/accounts/defaults/lockup/delayed_locking_account_test.go b/x/accounts/defaults/lockup/delayed_locking_account_test.go index dc3235c7a6..972a46f8dd 100644 --- a/x/accounts/defaults/lockup/delayed_locking_account_test.go +++ b/x/accounts/defaults/lockup/delayed_locking_account_test.go @@ -33,6 +33,8 @@ func setupDelayedAccount(t *testing.T, ctx context.Context, ss store.KVStoreServ } func TestDelayedAccountDelegate(t *testing.T) { + const valAddress = "val_address" + ctx, ss := newMockContext(t) sdkCtx := sdk.NewContext(nil, true, log.NewNopLogger()).WithContext(ctx).WithHeaderInfo(header.Info{ Time: time.Now(), @@ -41,7 +43,7 @@ func TestDelayedAccountDelegate(t *testing.T) { acc := setupDelayedAccount(t, sdkCtx, ss) _, err := acc.Delegate(sdkCtx, &lockuptypes.MsgDelegate{ Sender: "owner", - ValidatorAddress: "val_address", + ValidatorAddress: valAddress, Amount: sdk.NewCoin("test", math.NewInt(1)), }) require.NoError(t, err) @@ -60,7 +62,7 @@ func TestDelayedAccountDelegate(t *testing.T) { _, err = acc.Delegate(sdkCtx, &lockuptypes.MsgDelegate{ Sender: "owner", - ValidatorAddress: "val_address", + ValidatorAddress: valAddress, Amount: sdk.NewCoin("test", math.NewInt(5)), }) require.NoError(t, err) @@ -75,6 +77,8 @@ func TestDelayedAccountDelegate(t *testing.T) { } func TestDelayedAccountUndelegate(t *testing.T) { + const valAddress = "val_address" + ctx, ss := newMockContext(t) sdkCtx := sdk.NewContext(nil, true, log.NewNopLogger()).WithContext(ctx).WithHeaderInfo(header.Info{ Time: time.Now(), @@ -84,7 +88,7 @@ func TestDelayedAccountUndelegate(t *testing.T) { // Delegate first _, err := acc.Delegate(sdkCtx, &lockuptypes.MsgDelegate{ Sender: "owner", - ValidatorAddress: "val_address", + ValidatorAddress: valAddress, Amount: sdk.NewCoin("test", math.NewInt(1)), }) require.NoError(t, err) @@ -96,21 +100,21 @@ func TestDelayedAccountUndelegate(t *testing.T) { // Undelegate _, err = acc.Undelegate(sdkCtx, &lockuptypes.MsgUndelegate{ Sender: "owner", - ValidatorAddress: "val_address", + ValidatorAddress: valAddress, Amount: sdk.NewCoin("test", math.NewInt(1)), }) require.NoError(t, err) - entries, err := acc.UnbondEntries.Get(sdkCtx, "val_address") + entries, err := acc.UnbondEntries.Get(sdkCtx, valAddress) require.NoError(t, err) require.Len(t, entries.Entries, 1) require.True(t, entries.Entries[0].Amount.Amount.Equal(math.NewInt(1))) - require.True(t, entries.Entries[0].ValidatorAddress == "val_address") + require.True(t, entries.Entries[0].ValidatorAddress == valAddress) err = acc.checkUnbondingEntriesMature(sdkCtx) require.NoError(t, err) - _, err = acc.UnbondEntries.Get(sdkCtx, "val_address") + _, err = acc.UnbondEntries.Get(sdkCtx, valAddress) require.Error(t, err) delLocking, err = acc.DelegatedLocking.Get(ctx, "test")