Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: TestAccountsMigration systemtest with simdv2 #22673

Merged
merged 3 commits into from
Nov 28, 2024
Merged

fix: TestAccountsMigration systemtest with simdv2 #22673

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9133fb
regist msg server & query to app v2
hieuvubk Nov 28, 2024
b916f42
godoc
hieuvubk Nov 28, 2024
f24e040
lint
hieuvubk Nov 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions x/accounts/module.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"google.golang.org/grpc"

"cosmossdk.io/core/appmodule"
appmodulev2 "cosmossdk.io/core/appmodule/v2"
"cosmossdk.io/core/registry"
"cosmossdk.io/x/accounts/cli"
v1 "cosmossdk.io/x/accounts/v1"
Expand Down Expand Up @@ -61,6 +62,25 @@ func (am AppModule) RegisterServices(registrar grpc.ServiceRegistrar) error {
return nil
}

// RegisterQueryHandlers registers the query handlers for the accounts module.
func (am AppModule) RegisterQueryHandlers(router appmodulev2.QueryRouter) {
queryServer := NewQueryServer(am.k)

appmodulev2.RegisterMsgHandler(router, queryServer.AccountNumber)
appmodulev2.RegisterMsgHandler(router, queryServer.AccountQuery)
appmodulev2.RegisterMsgHandler(router, queryServer.AccountType)
appmodulev2.RegisterMsgHandler(router, queryServer.Schema)
}
Comment on lines +65 to +73
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Critical: Incorrect handler registration for queries

The implementation is using RegisterMsgHandler for registering query handlers, which is incorrect. This explains the system test failures mentioned in issue #22651 where query handlers couldn't be found.

Apply this fix:

func (am AppModule) RegisterQueryHandlers(router appmodulev2.QueryRouter) {
    queryServer := NewQueryServer(am.k)

-   appmodulev2.RegisterMsgHandler(router, queryServer.AccountNumber)
-   appmodulev2.RegisterMsgHandler(router, queryServer.AccountQuery)
-   appmodulev2.RegisterMsgHandler(router, queryServer.AccountType)
-   appmodulev2.RegisterMsgHandler(router, queryServer.Schema)
+   appmodulev2.RegisterQueryHandler(router, queryServer.AccountNumber)
+   appmodulev2.RegisterQueryHandler(router, queryServer.AccountQuery)
+   appmodulev2.RegisterQueryHandler(router, queryServer.AccountType)
+   appmodulev2.RegisterQueryHandler(router, queryServer.Schema)
}
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
// RegisterQueryHandlers registers the query handlers for the accounts module.
func (am AppModule) RegisterQueryHandlers(router appmodulev2.QueryRouter) {
queryServer := NewQueryServer(am.k)
appmodulev2.RegisterMsgHandler(router, queryServer.AccountNumber)
appmodulev2.RegisterMsgHandler(router, queryServer.AccountQuery)
appmodulev2.RegisterMsgHandler(router, queryServer.AccountType)
appmodulev2.RegisterMsgHandler(router, queryServer.Schema)
}
// RegisterQueryHandlers registers the query handlers for the accounts module.
func (am AppModule) RegisterQueryHandlers(router appmodulev2.QueryRouter) {
queryServer := NewQueryServer(am.k)
appmodulev2.RegisterQueryHandler(router, queryServer.AccountNumber)
appmodulev2.RegisterQueryHandler(router, queryServer.AccountQuery)
appmodulev2.RegisterQueryHandler(router, queryServer.AccountType)
appmodulev2.RegisterQueryHandler(router, queryServer.Schema)
}


// RegisterMsgHandlers registers the message handlers for the accounts module.
func (am AppModule) RegisterMsgHandlers(router appmodulev2.MsgRouter) {
msgServer := NewMsgServer(am.k)

appmodulev2.RegisterMsgHandler(router, msgServer.Execute)
appmodulev2.RegisterMsgHandler(router, msgServer.ExecuteBundle)
appmodulev2.RegisterMsgHandler(router, msgServer.Init)
}

// App module genesis

func (am AppModule) DefaultGenesis() json.RawMessage {
Expand Down
Loading