Merge pull request #134 from onomyprotocol/dong/updatewithaddress.Codec

update psm: use address.Codec of accountkeeper
onomyprotocol · Jan 14, 2025 · fda7329 · fda7329
2 parents b5245d9 + 372a94f
commit fda7329
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/x/psm/keeper/keeper.go b/x/psm/keeper/keeper.go
@@ -6,7 +6,6 @@ import (
 	"context"
 
 	"cosmossdk.io/collections"
-	"cosmossdk.io/core/address"
 	"cosmossdk.io/core/store"
 	"cosmossdk.io/log"
 	"cosmossdk.io/math"
@@ -20,7 +19,6 @@ import (
 type (
 	Keeper struct {
 		cdc          codec.BinaryCodec
-		addressCodec address.Codec
 		storeService store.KVStoreService
 		logger       log.Logger
 
@@ -42,9 +40,7 @@ type (
 
 func NewKeeper(
 	cdc codec.BinaryCodec,
-	// addressCodec address.Codec,
 	storeService store.KVStoreService,
-	// logger log.Logger,
 	authority string,
 
 	bankKeeper types.BankKeeper,
@@ -58,11 +54,9 @@ func NewKeeper(
 	sb := collections.NewSchemaBuilder(storeService)
 
 	k := Keeper{
-		cdc: cdc,
-		// addressCodec: addressCodec,
+		cdc:          cdc,
 		storeService: storeService,
 		authority:    authority,
-		// logger:       logger,
 
 		BankKeeper:      bankKeeper,
 		AccountKeeper:   accountKeeper,

diff --git a/x/psm/keeper/msg_server.go b/x/psm/keeper/msg_server.go
@@ -23,7 +23,7 @@ func NewMsgServerImpl(keeper Keeper) types.MsgServer {
 var _ types.MsgServer = msgServer{}
 
 func (k msgServer) UpdateParams(ctx context.Context, req *types.MsgUpdateParams) (*types.MsgUpdateParamsResponse, error) {
-	if _, err := k.keeper.addressCodec.StringToBytes(req.Authority); err != nil {
+	if _, err := k.keeper.AccountKeeper.AddressCodec().StringToBytes(req.Authority); err != nil {
 		return nil, errorsmod.Wrap(err, "invalid authority address")
 	}
 

diff --git a/x/psm/types/expected_keepers.go b/x/psm/types/expected_keepers.go
@@ -3,12 +3,14 @@ package types
 import (
 	"context"
 
+	addresscodec "cosmossdk.io/core/address"
 	"cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // AccountKeeper defines the expected interface for the Account module.
 type AccountKeeper interface {
+	AddressCodec() addresscodec.Codec
 	GetAccount(context.Context, sdk.AccAddress) sdk.AccountI // only used for simulation
 	GetModuleAddress(name string) sdk.AccAddress
 	// Methods imported from account should be defined here