Merge branch 'main' into nulnut/remove-fip20crosschain

PundiAI · Sep 23, 2024 · 9679b1d · 9679b1d
2 parents 56035ed + de10401
commit 9679b1d
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 247 deletions.
diff --git a/x/crosschain/keeper/keeper_router.go b/x/crosschain/keeper/keeper_router.go
@@ -34,16 +34,14 @@ func (k RouterKeeper) Logger(ctx sdk.Context) log.Logger {
 }
 
 type ModuleHandler struct {
-	QueryServer    types.QueryServer
-	MsgServer      types.MsgServer
-	ProposalServer proposalServer
+	QueryServer types.QueryServer
+	MsgServer   types.MsgServer
 }
 
 func NewModuleHandler(keeper Keeper) *ModuleHandler {
 	return &ModuleHandler{
-		QueryServer:    NewQueryServerImpl(keeper),
-		MsgServer:      NewMsgServerImpl(keeper),
-		ProposalServer: keeper,
+		QueryServer: NewQueryServerImpl(keeper),
+		MsgServer:   NewMsgServerImpl(keeper),
 	}
 }
 

diff --git a/x/crosschain/keeper/proposal_legacy.go b/x/crosschain/keeper/proposal_legacy.go
diff --git a/x/crosschain/keeper/proposal_legacy_test.go b/x/crosschain/keeper/proposal_legacy_test.go
diff --git a/x/crosschain/mock/expected_keepers_mocks.go b/x/crosschain/mock/expected_keepers_mocks.go