diff --git a/codec/address/bech32_codec.go b/codec/address/bech32_codec.go index d1daf93703f6..bbcbf9b90928 100644 --- a/codec/address/bech32_codec.go +++ b/codec/address/bech32_codec.go @@ -19,6 +19,11 @@ func NewBech32Codec(prefix string) address.Codec { return Bech32Codec{prefix} } +// GetAddressPrefix returns the bech32 prefix +func (bc Bech32Codec) GetAddressPrefix() string { + return bc.Bech32Prefix +} + // StringToBytes encodes text to bytes func (bc Bech32Codec) StringToBytes(text string) ([]byte, error) { hrp, bz, err := bech32.DecodeAndConvert(text) diff --git a/core/address/codec.go b/core/address/codec.go index 5f20690cbcc7..a298cd017f7b 100644 --- a/core/address/codec.go +++ b/core/address/codec.go @@ -2,8 +2,10 @@ package address // Codec defines an interface to convert addresses from and to string/bytes. type Codec interface { - // StringToBytes decodes text to bytes + // GetAddressPrefix returns the address prefix (if any). + GetAddressPrefix() string + // StringToBytes decodes text to bytes. StringToBytes(text string) ([]byte, error) - // BytesToString encodes bytes to text + // BytesToString encodes bytes to text. BytesToString(bz []byte) (string, error) } diff --git a/go.mod b/go.mod index 2699533faa34..b0ddfe2a653d 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ module github.com/cosmos/cosmos-sdk require ( cosmossdk.io/api v0.4.1 cosmossdk.io/collections v0.1.0 - cosmossdk.io/core v0.6.1 + cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab cosmossdk.io/depinject v1.0.0-alpha.3 cosmossdk.io/errors v1.0.0-beta.7 cosmossdk.io/log v1.0.0 diff --git a/go.sum b/go.sum index 659aecc3b42a..50c3c5bd658d 100644 --- a/go.sum +++ b/go.sum @@ -39,8 +39,8 @@ cosmossdk.io/api v0.4.1 h1:0ikaYM6GyxTYYcfBiyR8YnLCfhNnhKpEFnaSepCTmqg= cosmossdk.io/api v0.4.1/go.mod h1:jR7k5ok90LxW2lFUXvd8Vpo/dr4PpiyVegxdm7b1ZdE= cosmossdk.io/collections v0.1.0 h1:nzJGeiq32KnZroSrhB6rPifw4I85Cgmzw/YAmr4luv8= cosmossdk.io/collections v0.1.0/go.mod h1:xbauc0YsbUF8qKMVeBZl0pFCunxBIhKN/WlxpZ3lBuo= -cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= -cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab h1:T5M7ZlsIoOi+ystyBuEzk19kh72bXbtfMqq6NEIkub8= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab/go.mod h1:beJu7PuC+A7Os512U3gdsBrc3Qcax9XJnVE7jtiA+Gc= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= diff --git a/simapp/go.mod b/simapp/go.mod index c3a66895226d..ac930f7f7933 100644 --- a/simapp/go.mod +++ b/simapp/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( cosmossdk.io/api v0.4.1 cosmossdk.io/client/v2 v2.0.0-20230309163709-87da587416ba - cosmossdk.io/core v0.6.1 + cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab cosmossdk.io/depinject v1.0.0-alpha.3 cosmossdk.io/log v1.0.0 cosmossdk.io/math v1.0.0 diff --git a/simapp/go.sum b/simapp/go.sum index a05adcb99164..6f15f1fa49bd 100644 --- a/simapp/go.sum +++ b/simapp/go.sum @@ -192,8 +192,8 @@ cosmossdk.io/client/v2 v2.0.0-20230309163709-87da587416ba h1:LuPHCncU2KLMNPItFEC cosmossdk.io/client/v2 v2.0.0-20230309163709-87da587416ba/go.mod h1:SXdwqO7cN5htalh/lhXWP8V4zKtBrhhcSTU+ytuEtmM= cosmossdk.io/collections v0.1.0 h1:nzJGeiq32KnZroSrhB6rPifw4I85Cgmzw/YAmr4luv8= cosmossdk.io/collections v0.1.0/go.mod h1:xbauc0YsbUF8qKMVeBZl0pFCunxBIhKN/WlxpZ3lBuo= -cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= -cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab h1:T5M7ZlsIoOi+ystyBuEzk19kh72bXbtfMqq6NEIkub8= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab/go.mod h1:beJu7PuC+A7Os512U3gdsBrc3Qcax9XJnVE7jtiA+Gc= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= diff --git a/tests/go.mod b/tests/go.mod index 6042f34247ec..d7cfe24a0484 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -38,7 +38,7 @@ require ( cloud.google.com/go/storage v1.30.0 // indirect cosmossdk.io/client/v2 v2.0.0-20230309163709-87da587416ba // indirect cosmossdk.io/collections v0.1.0 // indirect - cosmossdk.io/core v0.6.1 // indirect + cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab // indirect filippo.io/edwards25519 v1.0.0 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect github.com/99designs/keyring v1.2.1 // indirect diff --git a/tests/go.sum b/tests/go.sum index 6a671c8303ff..98b7ea693937 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -192,8 +192,8 @@ cosmossdk.io/client/v2 v2.0.0-20230309163709-87da587416ba h1:LuPHCncU2KLMNPItFEC cosmossdk.io/client/v2 v2.0.0-20230309163709-87da587416ba/go.mod h1:SXdwqO7cN5htalh/lhXWP8V4zKtBrhhcSTU+ytuEtmM= cosmossdk.io/collections v0.1.0 h1:nzJGeiq32KnZroSrhB6rPifw4I85Cgmzw/YAmr4luv8= cosmossdk.io/collections v0.1.0/go.mod h1:xbauc0YsbUF8qKMVeBZl0pFCunxBIhKN/WlxpZ3lBuo= -cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= -cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab h1:T5M7ZlsIoOi+ystyBuEzk19kh72bXbtfMqq6NEIkub8= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab/go.mod h1:beJu7PuC+A7Os512U3gdsBrc3Qcax9XJnVE7jtiA+Gc= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= diff --git a/tools/rosetta/go.mod b/tools/rosetta/go.mod index 7979dd8039f5..b34ad7239a56 100644 --- a/tools/rosetta/go.mod +++ b/tools/rosetta/go.mod @@ -19,7 +19,7 @@ require ( require ( cosmossdk.io/api v0.4.1 // indirect cosmossdk.io/collections v0.1.0 // indirect - cosmossdk.io/core v0.6.1 // indirect + cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect cosmossdk.io/errors v1.0.0-beta.7 // indirect cosmossdk.io/store v0.1.0-alpha.1.0.20230328185921-37ba88872dbc // indirect diff --git a/tools/rosetta/go.sum b/tools/rosetta/go.sum index c7cc27856918..353bc9265713 100644 --- a/tools/rosetta/go.sum +++ b/tools/rosetta/go.sum @@ -39,8 +39,8 @@ cosmossdk.io/api v0.4.1 h1:0ikaYM6GyxTYYcfBiyR8YnLCfhNnhKpEFnaSepCTmqg= cosmossdk.io/api v0.4.1/go.mod h1:jR7k5ok90LxW2lFUXvd8Vpo/dr4PpiyVegxdm7b1ZdE= cosmossdk.io/collections v0.1.0 h1:nzJGeiq32KnZroSrhB6rPifw4I85Cgmzw/YAmr4luv8= cosmossdk.io/collections v0.1.0/go.mod h1:xbauc0YsbUF8qKMVeBZl0pFCunxBIhKN/WlxpZ3lBuo= -cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= -cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab h1:T5M7ZlsIoOi+ystyBuEzk19kh72bXbtfMqq6NEIkub8= +cosmossdk.io/core v0.6.2-0.20230423164157-c63dec0f7aab/go.mod h1:beJu7PuC+A7Os512U3gdsBrc3Qcax9XJnVE7jtiA+Gc= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0-beta.7 h1:gypHW76pTQGVnHKo6QBkb4yFOJjC+sUGRc5Al3Odj1w= diff --git a/x/auth/keeper/bech32_codec.go b/x/auth/keeper/bech32_codec.go index 926dd45f6b67..1039af041745 100644 --- a/x/auth/keeper/bech32_codec.go +++ b/x/auth/keeper/bech32_codec.go @@ -22,6 +22,11 @@ func NewBech32Codec(prefix string) address.Codec { return bech32Codec{prefix} } +// GetAddressPrefix returns the bech32 prefix +func (bc bech32Codec) GetAddressPrefix() string { + return bc.bech32Prefix +} + // StringToBytes encodes text to bytes func (bc bech32Codec) StringToBytes(text string) ([]byte, error) { if len(strings.TrimSpace(text)) == 0 { diff --git a/x/auth/keeper/grpc_query.go b/x/auth/keeper/grpc_query.go index 482890de7a51..2ef5cb109846 100644 --- a/x/auth/keeper/grpc_query.go +++ b/x/auth/keeper/grpc_query.go @@ -78,7 +78,7 @@ func (ak AccountKeeper) Account(c context.Context, req *types.QueryAccountReques } ctx := sdk.UnwrapSDKContext(c) - addr, err := ak.addressCdc.StringToBytes(req.Address) + addr, err := ak.StringToBytes(req.Address) if err != nil { return nil, err } @@ -165,12 +165,12 @@ func (ak AccountKeeper) ModuleAccountByName(c context.Context, req *types.QueryM // Bech32Prefix returns the keeper internally stored bech32 prefix. func (ak AccountKeeper) Bech32Prefix(ctx context.Context, req *types.Bech32PrefixRequest) (*types.Bech32PrefixResponse, error) { - bech32Prefix, err := ak.getBech32Prefix() - if err != nil { - return nil, err + addressPrefix := ak.GetAddressPrefix() + if addressPrefix == "" { + return nil, status.Error(codes.NotFound, "bech32 prefix is not set") } - return &types.Bech32PrefixResponse{Bech32Prefix: bech32Prefix}, nil + return &types.Bech32PrefixResponse{Bech32Prefix: addressPrefix}, nil } // AddressBytesToString converts an address from bytes to string, using the @@ -184,7 +184,7 @@ func (ak AccountKeeper) AddressBytesToString(ctx context.Context, req *types.Add return nil, errors.New("empty address bytes is not allowed") } - text, err := ak.addressCdc.BytesToString(req.AddressBytes) + text, err := ak.BytesToString(req.AddressBytes) if err != nil { return nil, err } @@ -203,7 +203,7 @@ func (ak AccountKeeper) AddressStringToBytes(ctx context.Context, req *types.Add return nil, errors.New("empty address string is not allowed") } - bz, err := ak.addressCdc.StringToBytes(req.AddressString) + bz, err := ak.StringToBytes(req.AddressString) if err != nil { return nil, err } @@ -222,7 +222,7 @@ func (ak AccountKeeper) AccountInfo(goCtx context.Context, req *types.QueryAccou } ctx := sdk.UnwrapSDKContext(goCtx) - addr, err := ak.addressCdc.StringToBytes(req.Address) + addr, err := ak.StringToBytes(req.Address) if err != nil { return nil, err } @@ -246,15 +246,3 @@ func (ak AccountKeeper) AccountInfo(goCtx context.Context, req *types.QueryAccou }, }, nil } - -// BytesToString converts an address from bytes to string, using the -// keeper's bech32 prefix. -func (ak AccountKeeper) BytesToString(address []byte) (string, error) { - return ak.addressCdc.BytesToString(address) -} - -// StringToBytes converts an address from string to bytes, using the -// keeper's bech32 prefix. -func (ak AccountKeeper) StringToBytes(address string) ([]byte, error) { - return ak.addressCdc.StringToBytes(address) -} diff --git a/x/auth/keeper/keeper.go b/x/auth/keeper/keeper.go index e5db0183bb70..4a932a91e50a 100644 --- a/x/auth/keeper/keeper.go +++ b/x/auth/keeper/keeper.go @@ -21,6 +21,8 @@ import ( // AccountKeeperI is the interface contract that x/auth's keeper implements. type AccountKeeperI interface { + address.Codec + // Return a new account with the next account number and the specified address. Does not save the new account to the store. NewAccountWithAddress(context.Context, sdk.AccAddress) sdk.AccountI @@ -58,20 +60,20 @@ type AccountKeeperI interface { // AccountKeeper encodes/decodes accounts using the go-amino (binary) // encoding/decoding library. type AccountKeeper struct { + address.Codec + storeService store.KVStoreService cdc codec.BinaryCodec permAddrs map[string]types.PermissionsForAddress // The prototypical AccountI constructor. - proto func() sdk.AccountI - addressCdc address.Codec + proto func() sdk.AccountI // the address capable of executing a MsgUpdateParams message. Typically, this // should be the x/gov module account. authority string // State - ParamsState collections.Item[types.Params] // NOTE: name is this because it conflicts with the Params gRPC method impl AccountNumber collections.Sequence } @@ -93,16 +95,14 @@ func NewAccountKeeper( permAddrs[name] = types.NewPermissionsForAddress(name, perms) } - bech32Codec := NewBech32Codec(bech32Prefix) - sb := collections.NewSchemaBuilder(storeService) return AccountKeeper{ + Codec: NewBech32Codec(bech32Prefix), storeService: storeService, proto: proto, cdc: cdc, permAddrs: permAddrs, - addressCdc: bech32Codec, authority: authority, ParamsState: collections.NewItem(sb, types.ParamsKey, "params", codec.CollValue[types.Params](cdc)), AccountNumber: collections.NewSequence(sb, types.GlobalAccountNumberKey, "account_number"), @@ -117,7 +117,7 @@ func (ak AccountKeeper) GetAuthority() string { // GetAddressCodec returns the x/auth module's address. // x/auth is tied to bech32 encoded user accounts func (ak AccountKeeper) GetAddressCodec() address.Codec { - return ak.addressCdc + return ak.Codec } // Logger returns a module-specific logger. @@ -254,16 +254,6 @@ func (ak AccountKeeper) UnmarshalAccount(bz []byte) (sdk.AccountI, error) { // GetCodec return codec.Codec object used by the keeper func (ak AccountKeeper) GetCodec() codec.BinaryCodec { return ak.cdc } -// add getter for bech32Prefix -func (ak AccountKeeper) getBech32Prefix() (string, error) { - bech32Codec, ok := ak.addressCdc.(bech32Codec) - if !ok { - return "", fmt.Errorf("unable cast addressCdc to bech32Codec; expected %T got %T", bech32Codec, ak.addressCdc) - } - - return bech32Codec.bech32Prefix, nil -} - // SetParams sets the auth module's parameters. // CONTRACT: This method performs no validation of the parameters. func (ak AccountKeeper) SetParams(ctx context.Context, params types.Params) error { diff --git a/x/authz/testutil/expected_keepers_mocks.go b/x/authz/testutil/expected_keepers_mocks.go index ee664fb66a12..5f424a33c2ae 100644 --- a/x/authz/testutil/expected_keepers_mocks.go +++ b/x/authz/testutil/expected_keepers_mocks.go @@ -64,6 +64,20 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(ctx, addr interface{}) *gomo return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), ctx, addr) } +// GetAddressPrefix mocks base method. +func (m *MockAccountKeeper) GetAddressPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAddressPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// GetAddressPrefix indicates an expected call of GetAddressPrefix. +func (mr *MockAccountKeeperMockRecorder) GetAddressPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressPrefix", reflect.TypeOf((*MockAccountKeeper)(nil).GetAddressPrefix)) +} + // NewAccountWithAddress mocks base method. func (m *MockAccountKeeper) NewAccountWithAddress(ctx context.Context, addr types.AccAddress) types.AccountI { m.ctrl.T.Helper() diff --git a/x/distribution/testutil/expected_keepers_mocks.go b/x/distribution/testutil/expected_keepers_mocks.go index 31471ca6e769..2b34c084f174 100644 --- a/x/distribution/testutil/expected_keepers_mocks.go +++ b/x/distribution/testutil/expected_keepers_mocks.go @@ -65,6 +65,20 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(ctx, addr interface{}) *gomo return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), ctx, addr) } +// GetAddressPrefix mocks base method. +func (m *MockAccountKeeper) GetAddressPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAddressPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// GetAddressPrefix indicates an expected call of GetAddressPrefix. +func (mr *MockAccountKeeperMockRecorder) GetAddressPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressPrefix", reflect.TypeOf((*MockAccountKeeper)(nil).GetAddressPrefix)) +} + // GetModuleAccount mocks base method. func (m *MockAccountKeeper) GetModuleAccount(ctx context.Context, name string) types.ModuleAccountI { m.ctrl.T.Helper() diff --git a/x/feegrant/testutil/expected_keepers_mocks.go b/x/feegrant/testutil/expected_keepers_mocks.go index b73d1735322d..be58d81b117a 100644 --- a/x/feegrant/testutil/expected_keepers_mocks.go +++ b/x/feegrant/testutil/expected_keepers_mocks.go @@ -64,6 +64,20 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(ctx, addr interface{}) *gomo return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), ctx, addr) } +// GetAddressPrefix mocks base method. +func (m *MockAccountKeeper) GetAddressPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAddressPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// GetAddressPrefix indicates an expected call of GetAddressPrefix. +func (mr *MockAccountKeeperMockRecorder) GetAddressPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressPrefix", reflect.TypeOf((*MockAccountKeeper)(nil).GetAddressPrefix)) +} + // GetModuleAccount mocks base method. func (m *MockAccountKeeper) GetModuleAccount(ctx context.Context, moduleName string) types.ModuleAccountI { m.ctrl.T.Helper() diff --git a/x/gov/testutil/expected_keepers_mocks.go b/x/gov/testutil/expected_keepers_mocks.go index 58027e55ea89..99865594d7dd 100644 --- a/x/gov/testutil/expected_keepers_mocks.go +++ b/x/gov/testutil/expected_keepers_mocks.go @@ -69,6 +69,20 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(ctx, addr interface{}) *gomo return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), ctx, addr) } +// GetAddressPrefix mocks base method. +func (m *MockAccountKeeper) GetAddressPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAddressPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// GetAddressPrefix indicates an expected call of GetAddressPrefix. +func (mr *MockAccountKeeperMockRecorder) GetAddressPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressPrefix", reflect.TypeOf((*MockAccountKeeper)(nil).GetAddressPrefix)) +} + // GetModuleAccount mocks base method. func (m *MockAccountKeeper) GetModuleAccount(ctx context.Context, name string) types.ModuleAccountI { m.ctrl.T.Helper() diff --git a/x/group/testutil/expected_keepers_mocks.go b/x/group/testutil/expected_keepers_mocks.go index ae05d4e8e1ff..3973108a2f45 100644 --- a/x/group/testutil/expected_keepers_mocks.go +++ b/x/group/testutil/expected_keepers_mocks.go @@ -65,6 +65,20 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(arg0, arg1 interface{}) *gom return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), arg0, arg1) } +// GetAddressPrefix mocks base method. +func (m *MockAccountKeeper) GetAddressPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAddressPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// GetAddressPrefix indicates an expected call of GetAddressPrefix. +func (mr *MockAccountKeeperMockRecorder) GetAddressPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressPrefix", reflect.TypeOf((*MockAccountKeeper)(nil).GetAddressPrefix)) +} + // NewAccount mocks base method. func (m *MockAccountKeeper) NewAccount(arg0 context.Context, arg1 types.AccountI) types.AccountI { m.ctrl.T.Helper() diff --git a/x/nft/testutil/expected_keepers_mocks.go b/x/nft/testutil/expected_keepers_mocks.go index a54ef8207077..de781a71545b 100644 --- a/x/nft/testutil/expected_keepers_mocks.go +++ b/x/nft/testutil/expected_keepers_mocks.go @@ -101,6 +101,20 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(ctx, addr interface{}) *gomo return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), ctx, addr) } +// GetAddressPrefix mocks base method. +func (m *MockAccountKeeper) GetAddressPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAddressPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// GetAddressPrefix indicates an expected call of GetAddressPrefix. +func (mr *MockAccountKeeperMockRecorder) GetAddressPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressPrefix", reflect.TypeOf((*MockAccountKeeper)(nil).GetAddressPrefix)) +} + // GetModuleAddress mocks base method. func (m *MockAccountKeeper) GetModuleAddress(name string) types.AccAddress { m.ctrl.T.Helper() diff --git a/x/staking/testutil/expected_keepers_mocks.go b/x/staking/testutil/expected_keepers_mocks.go index ba3036da7561..00c2b79847c6 100644 --- a/x/staking/testutil/expected_keepers_mocks.go +++ b/x/staking/testutil/expected_keepers_mocks.go @@ -117,6 +117,20 @@ func (mr *MockAccountKeeperMockRecorder) GetAccount(ctx, addr interface{}) *gomo return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccount", reflect.TypeOf((*MockAccountKeeper)(nil).GetAccount), ctx, addr) } +// GetAddressPrefix mocks base method. +func (m *MockAccountKeeper) GetAddressPrefix() string { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "GetAddressPrefix") + ret0, _ := ret[0].(string) + return ret0 +} + +// GetAddressPrefix indicates an expected call of GetAddressPrefix. +func (mr *MockAccountKeeperMockRecorder) GetAddressPrefix() *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAddressPrefix", reflect.TypeOf((*MockAccountKeeper)(nil).GetAddressPrefix)) +} + // GetModuleAccount mocks base method. func (m *MockAccountKeeper) GetModuleAccount(ctx context.Context, moduleName string) types.ModuleAccountI { m.ctrl.T.Helper()