From 496ec07f01c5931f8e3823436d9ec4a4a8c8c4f3 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Thu, 28 Nov 2024 10:37:15 +0100
Subject: [PATCH] fix: TestAccountsMigration systemtest with simdv2 (backport
 #22673) (#22674)

Co-authored-by: Hieu Vu <72878483+hieuvubk@users.noreply.github.com>
---
 x/accounts/module.go | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/x/accounts/module.go b/x/accounts/module.go
index f7958240b7b5..daadebfe91ce 100644
--- a/x/accounts/module.go
+++ b/x/accounts/module.go
@@ -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"
@@ -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)
+}
+
+// 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 {