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

chore: remove baseapp from x/accounts (#23355)

Browse Source 
Co-authored-by: Tyler <48813565+technicallyty@users.noreply.github.com>
This commit is contained in:
Alex | Interchain Labs
2025-01-16 18:52:36 +00:00
committed by GitHub
co-authored by Tyler
parent 9a27317209
commit 952db2b320
28 changed files with 204 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/integration/v2/accounts/fixture_test.go
+5 -4
View File
@@ -8,6 +8,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/router"
"cosmossdk.io/core/testing/msgrouter"
"cosmossdk.io/core/transaction"
"cosmossdk.io/depinject"
"cosmossdk.io/log"
@@ -144,14 +145,14 @@ func initFixture(t *testing.T, f authentiacteFunc) *fixture {
var err error
startupCfg := integration.DefaultStartUpConfig(t)
msgRouterService := integration.NewRouterService()
msgRouterService := msgrouter.NewRouterService()
fixture.registerMsgRouterService(msgRouterService)
var routerFactory runtime.RouterServiceFactory = func(_ []byte) router.Service {
return msgRouterService
}
queryRouterService := integration.NewRouterService()
queryRouterService := msgrouter.NewRouterService()
fixture.registerQueryRouterService(queryRouterService)
serviceBuilder := runtime.NewRouterBuilder(routerFactory, queryRouterService)
@@ -188,7 +189,7 @@ func initFixture(t *testing.T, f authentiacteFunc) *fixture {
return fixture
}
func (f *fixture) registerMsgRouterService(router *integration.RouterService) {
func (f *fixture) registerMsgRouterService(router *msgrouter.RouterService) {
// register custom router service
bankSendHandler := func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
msg, ok := req.(*banktypes.MsgSend)
@@ -203,7 +204,7 @@ func (f *fixture) registerMsgRouterService(router *integration.RouterService) {
router.RegisterHandler(bankSendHandler, "cosmos.bank.v1beta1.MsgSend")
}
func (f *fixture) registerQueryRouterService(router *integration.RouterService) {
func (f *fixture) registerQueryRouterService(router *msgrouter.RouterService) {
// register custom router service
queryHandler := func(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) {
req, ok := msg.(*accountsv1.AccountNumberRequest)
tests/integration/v2/accounts/lockup/utils.go
+5 -4
View File
@@ -8,6 +8,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/router"
"cosmossdk.io/core/testing/msgrouter"
"cosmossdk.io/core/transaction"
"cosmossdk.io/depinject"
"cosmossdk.io/log"
@@ -78,14 +79,14 @@ func (s *IntegrationTestSuite) SetupSuite() {
var err error
startupCfg := integration.DefaultStartUpConfig(s.T())
msgRouterService := integration.NewRouterService()
msgRouterService := msgrouter.NewRouterService()
s.registerMsgRouterService(msgRouterService)
var routerFactory runtime.RouterServiceFactory = func(_ []byte) router.Service {
return msgRouterService
}
queryRouterService := integration.NewRouterService()
queryRouterService := msgrouter.NewRouterService()
s.registerQueryRouterService(queryRouterService)
serviceBuilder := runtime.NewRouterBuilder(routerFactory, queryRouterService)
@@ -113,7 +114,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
s.ctx = s.app.StateLatestContext(s.T())
}
func (s *IntegrationTestSuite) registerMsgRouterService(router *integration.RouterService) {
func (s *IntegrationTestSuite) registerMsgRouterService(router *msgrouter.RouterService) {
// register custom router service
bankSendHandler := func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
msg, ok := req.(*banktypes.MsgSend)
@@ -161,7 +162,7 @@ func (s *IntegrationTestSuite) registerMsgRouterService(router *integration.Rout
router.RegisterHandler(distrWithdrawRewardHandler, "cosmos.distribution.v1beta1.MsgWithdrawDelegatorReward")
}
func (s *IntegrationTestSuite) registerQueryRouterService(router *integration.RouterService) {
func (s *IntegrationTestSuite) registerQueryRouterService(router *msgrouter.RouterService) {
// register custom router service
stakingParamsQueryHandler := func(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) {
req, ok := msg.(*stakingtypes.QueryParamsRequest)
tests/integration/v2/accounts/multisig/test_suite.go
+5 -4
View File
@@ -6,6 +6,7 @@ import (
"github.com/stretchr/testify/suite"
"cosmossdk.io/core/router"
"cosmossdk.io/core/testing/msgrouter"
"cosmossdk.io/core/transaction"
"cosmossdk.io/depinject"
"cosmossdk.io/log"
@@ -73,14 +74,14 @@ func (s *IntegrationTestSuite) SetupSuite() {
var err error
startupCfg := integration.DefaultStartUpConfig(s.T())
msgRouterService := integration.NewRouterService()
msgRouterService := msgrouter.NewRouterService()
s.registerMsgRouterService(msgRouterService)
var routerFactory runtime.RouterServiceFactory = func(_ []byte) router.Service {
return msgRouterService
}
queryRouterService := integration.NewRouterService()
queryRouterService := msgrouter.NewRouterService()
s.registerQueryRouterService(queryRouterService)
serviceBuilder := runtime.NewRouterBuilder(routerFactory, queryRouterService)
@@ -115,7 +116,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
}
}
func (s *IntegrationTestSuite) registerMsgRouterService(router *integration.RouterService) {
func (s *IntegrationTestSuite) registerMsgRouterService(router *msgrouter.RouterService) {
// register custom router service
bankSendHandler := func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
msg, ok := req.(*banktypes.MsgSend)
@@ -142,7 +143,7 @@ func (s *IntegrationTestSuite) registerMsgRouterService(router *integration.Rout
router.RegisterHandler(accountsExeccHandler, "cosmos.accounts.v1.MsgExecute")
}
func (s *IntegrationTestSuite) registerQueryRouterService(router *integration.RouterService) {
func (s *IntegrationTestSuite) registerQueryRouterService(router *msgrouter.RouterService) {
// register custom router service
bankBalanceQueryHandler := func(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) {
req, ok := msg.(*banktypes.QueryBalanceRequest)
tests/integration/v2/auth/app_test.go
+5 -4
View File
@@ -7,6 +7,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/router"
"cosmossdk.io/core/testing/msgrouter"
"cosmossdk.io/core/transaction"
"cosmossdk.io/depinject"
"cosmossdk.io/log"
@@ -65,14 +66,14 @@ func createTestSuite(t *testing.T) *suite {
var err error
startupCfg := integration.DefaultStartUpConfig(t)
msgRouterService := integration.NewRouterService()
msgRouterService := msgrouter.NewRouterService()
res.registerMsgRouterService(msgRouterService)
var routerFactory runtime.RouterServiceFactory = func(_ []byte) router.Service {
return msgRouterService
}
queryRouterService := integration.NewRouterService()
queryRouterService := msgrouter.NewRouterService()
res.registerQueryRouterService(queryRouterService)
serviceBuilder := runtime.NewRouterBuilder(routerFactory, queryRouterService)
@@ -103,7 +104,7 @@ func createTestSuite(t *testing.T) *suite {
return &res
}
func (s *suite) registerMsgRouterService(router *integration.RouterService) {
func (s *suite) registerMsgRouterService(router *msgrouter.RouterService) {
// register custom router service
bankSendHandler := func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
msg, ok := req.(*banktypes.MsgSend)
@@ -118,7 +119,7 @@ func (s *suite) registerMsgRouterService(router *integration.RouterService) {
router.RegisterHandler(bankSendHandler, "cosmos.bank.v1beta1.MsgSend")
}
func (s *suite) registerQueryRouterService(router *integration.RouterService) {
func (s *suite) registerQueryRouterService(router *msgrouter.RouterService) {
// register custom router service
queryHandler := func(ctx context.Context, msg transaction.Msg) (transaction.Msg, error) {
req, ok := msg.(*accountsv1.AccountNumberRequest)
tests/integration/v2/distribution/fixture_test.go
+5 -4
View File
@@ -9,6 +9,7 @@ import (
"cosmossdk.io/core/comet"
corecontext "cosmossdk.io/core/context"
"cosmossdk.io/core/router"
"cosmossdk.io/core/testing/msgrouter"
"cosmossdk.io/core/transaction"
"cosmossdk.io/depinject"
"cosmossdk.io/log"
@@ -88,14 +89,14 @@ func createTestFixture(t *testing.T) *fixture {
var err error
startupCfg := integration.DefaultStartUpConfig(t)
msgRouterService := integration.NewRouterService()
msgRouterService := msgrouter.NewRouterService()
res.registerMsgRouterService(msgRouterService)
var routerFactory runtime.RouterServiceFactory = func(_ []byte) router.Service {
return msgRouterService
}
queryRouterService := integration.NewRouterService()
queryRouterService := msgrouter.NewRouterService()
res.registerQueryRouterService(queryRouterService)
serviceBuilder := runtime.NewRouterBuilder(routerFactory, queryRouterService)
@@ -139,7 +140,7 @@ func createTestFixture(t *testing.T) *fixture {
return &res
}
func (s *fixture) registerMsgRouterService(router *integration.RouterService) {
func (s *fixture) registerMsgRouterService(router *msgrouter.RouterService) {
// register custom router service
bankSendHandler := func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
msg, ok := req.(*banktypes.MsgSend)
@@ -154,6 +155,6 @@ func (s *fixture) registerMsgRouterService(router *integration.RouterService) {
router.RegisterHandler(bankSendHandler, "cosmos.bank.v1beta1.MsgSend")
}
func (s *fixture) registerQueryRouterService(router *integration.RouterService) {
func (s *fixture) registerQueryRouterService(_ *msgrouter.RouterService) {
// register custom router service
}
tests/integration/v2/gov/common_test.go
+5 -4
View File
@@ -11,6 +11,7 @@ import (
"gotest.tools/v3/assert"
"cosmossdk.io/core/router"
"cosmossdk.io/core/testing/msgrouter"
"cosmossdk.io/core/transaction"
"cosmossdk.io/depinject"
sdklog "cosmossdk.io/log"
@@ -144,14 +145,14 @@ func createTestSuite(t *testing.T, genesisBehavior int) suite {
startupCfg := integration.DefaultStartUpConfig(t)
msgRouterService := integration.NewRouterService()
msgRouterService := msgrouter.NewRouterService()
res.registerMsgRouterService(msgRouterService)
var routerFactory runtime.RouterServiceFactory = func(_ []byte) router.Service {
return msgRouterService
}
queryRouterService := integration.NewRouterService()
queryRouterService := msgrouter.NewRouterService()
res.registerQueryRouterService(queryRouterService)
serviceBuilder := runtime.NewRouterBuilder(routerFactory, queryRouterService)
@@ -173,7 +174,7 @@ func createTestSuite(t *testing.T, genesisBehavior int) suite {
return res
}
func (s *suite) registerMsgRouterService(router *integration.RouterService) {
func (s *suite) registerMsgRouterService(router *msgrouter.RouterService) {
// register custom router service
bankSendHandler := func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
msg, ok := req.(*banktypes.MsgSend)
@@ -202,5 +203,5 @@ func (s *suite) registerMsgRouterService(router *integration.RouterService) {
router.RegisterHandler(govSubmitProposalHandler, "/cosmos.gov.v1.MsgExecLegacyContent")
}
func (f *suite) registerQueryRouterService(router *integration.RouterService) {
func (f *suite) registerQueryRouterService(_ *msgrouter.RouterService) {
}
tests/integration/v2/gov/keeper/fixture_test.go
+5 -4
View File
@@ -7,6 +7,7 @@ import (
"github.com/stretchr/testify/require"
"cosmossdk.io/core/router"
"cosmossdk.io/core/testing/msgrouter"
"cosmossdk.io/core/transaction"
"cosmossdk.io/depinject"
"cosmossdk.io/log"
@@ -59,14 +60,14 @@ func initFixture(t *testing.T) *fixture {
startupCfg := integration.DefaultStartUpConfig(t)
msgRouterService := integration.NewRouterService()
msgRouterService := msgrouter.NewRouterService()
res.registerMsgRouterService(msgRouterService)
var routerFactory runtime.RouterServiceFactory = func(_ []byte) router.Service {
return msgRouterService
}
queryRouterService := integration.NewRouterService()
queryRouterService := msgrouter.NewRouterService()
res.registerQueryRouterService(queryRouterService)
serviceBuilder := runtime.NewRouterBuilder(routerFactory, queryRouterService)
@@ -88,7 +89,7 @@ func initFixture(t *testing.T) *fixture {
return &res
}
func (f *fixture) registerMsgRouterService(router *integration.RouterService) {
func (f *fixture) registerMsgRouterService(router *msgrouter.RouterService) {
// register custom router service
govSubmitProposalHandler := func(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
@@ -104,5 +105,5 @@ func (f *fixture) registerMsgRouterService(router *integration.RouterService) {
router.RegisterHandler(govSubmitProposalHandler, "/cosmos.gov.v1.MsgExecLegacyContent")
}
func (f *fixture) registerQueryRouterService(router *integration.RouterService) {
func (f *fixture) registerQueryRouterService(_ *msgrouter.RouterService) {
}
tests/integration/v2/services.go
-40
View File
@@ -16,7 +16,6 @@ import (
"cosmossdk.io/core/event"
"cosmossdk.io/core/gas"
"cosmossdk.io/core/header"
"cosmossdk.io/core/router"
"cosmossdk.io/core/server"
corestore "cosmossdk.io/core/store"
"cosmossdk.io/core/transaction"
@@ -316,45 +315,6 @@ func applyStateChanges(dst, src corestore.WriterMap) error {
return dst.ApplyStateChanges(changes)
}
// msgTypeURL returns the TypeURL of a proto message.
func msgTypeURL(msg gogoproto.Message) string {
return gogoproto.MessageName(msg)
}
type routerHandler func(context.Context, transaction.Msg) (transaction.Msg, error)
var _ router.Service = &RouterService{}
// custom router service for integration tests
type RouterService struct {
handlers map[string]routerHandler
}
func NewRouterService() *RouterService {
return &RouterService{
handlers: make(map[string]routerHandler),
}
}
func (rs *RouterService) RegisterHandler(handler routerHandler, typeUrl string) {
rs.handlers[typeUrl] = handler
}
func (rs RouterService) CanInvoke(ctx context.Context, typeUrl string) error {
if rs.handlers[typeUrl] == nil {
return fmt.Errorf("no handler for typeURL %s", typeUrl)
}
return nil
}
func (rs RouterService) Invoke(ctx context.Context, req transaction.Msg) (transaction.Msg, error) {
typeUrl := msgTypeURL(req)
if rs.handlers[typeUrl] == nil {
return nil, fmt.Errorf("no handler for typeURL %s", typeUrl)
}
return rs.handlers[typeUrl](ctx, req)
}
var _ header.Service = &HeaderService{}
type HeaderService struct{}