diff --git a/x/group/client/cli/util.go b/x/group/client/cli/util.go index 9d9c0ecf5d..801ee686ed 100644 --- a/x/group/client/cli/util.go +++ b/x/group/client/cli/util.go @@ -57,7 +57,7 @@ func execFromString(execStr string) group.Exec { return exec } -// CLIProposal defines a Msg-based group proposal for CLI purposes. +// Proposal defines a Msg-based group proposal for CLI purposes. type Proposal struct { GroupPolicyAddress string `json:"group_policy_address"` // Messages defines an array of sdk.Msgs proto-JSON-encoded as Anys. diff --git a/x/group/expected_keepers.go b/x/group/expected_keepers.go index 389665843d..d80500efc9 100644 --- a/x/group/expected_keepers.go +++ b/x/group/expected_keepers.go @@ -6,15 +6,15 @@ import ( ) type AccountKeeper interface { - // Return a new account with the next account number. Does not save the new account to the store. + // NewAccount returns a new account with the next account number. Does not save the new account to the store. NewAccount(sdk.Context, authtypes.AccountI) authtypes.AccountI - // Retrieve an account from the store. + // GetAccount retrieves an account from the store. GetAccount(sdk.Context, sdk.AccAddress) authtypes.AccountI - // Set an account in the store. + // SetAccount sets an account in the store. SetAccount(sdk.Context, authtypes.AccountI) - // Remove an account in the store. + // RemoveAccount removes an account in the store. RemoveAccount(ctx sdk.Context, acc authtypes.AccountI) } diff --git a/x/group/keeper/proposal_executor.go b/x/group/keeper/proposal_executor.go index 4ae0b30517..fa2ff398d1 100644 --- a/x/group/keeper/proposal_executor.go +++ b/x/group/keeper/proposal_executor.go @@ -3,6 +3,7 @@ package keeper import ( "fmt" + errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" @@ -41,11 +42,11 @@ func (s Keeper) doExecuteMsgs(ctx sdk.Context, router *baseapp.MsgServiceRouter, for i, msg := range msgs { handler := s.router.Handler(msg) if handler == nil { - return nil, sdkerrors.Wrapf(errors.ErrInvalid, "no message handler found for %q", sdk.MsgTypeURL(msg)) + return nil, errorsmod.Wrapf(errors.ErrInvalid, "no message handler found for %q", sdk.MsgTypeURL(msg)) } r, err := handler(ctx, msg) if err != nil { - return nil, sdkerrors.Wrapf(err, "message %s at position %d", sdk.MsgTypeURL(msg), i) + return nil, errorsmod.Wrapf(err, "message %s at position %d", sdk.MsgTypeURL(msg), i) } // Handler should always return non-nil sdk.Result. if r == nil { @@ -67,7 +68,7 @@ func ensureMsgAuthZ(msgs []sdk.Msg, groupPolicyAcc sdk.AccAddress) error { // but we prefer to loop through all GetSigners just to be sure. for _, acct := range msgs[i].GetSigners() { if !groupPolicyAcc.Equals(acct) { - return sdkerrors.Wrapf(sdkerrors.ErrUnauthorized, "msg does not have group policy authorization; expected %s, got %s", groupPolicyAcc.String(), acct.String()) + return errorsmod.Wrapf(sdkerrors.ErrUnauthorized, "msg does not have group policy authorization; expected %s, got %s", groupPolicyAcc.String(), acct.String()) } } } diff --git a/x/group/module/abci_test.go b/x/group/module/abci_test.go index 0f92cc7c67..43f0436be3 100644 --- a/x/group/module/abci_test.go +++ b/x/group/module/abci_test.go @@ -5,6 +5,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + tmproto "github.com/tendermint/tendermint/proto/tendermint/types" + tmtime "github.com/tendermint/tendermint/types/time" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/runtime" simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" @@ -17,9 +21,6 @@ import ( "github.com/cosmos/cosmos-sdk/x/group/module" grouptestutil "github.com/cosmos/cosmos-sdk/x/group/testutil" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - "github.com/stretchr/testify/suite" - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - tmtime "github.com/tendermint/tendermint/types/time" ) type IntegrationTestSuite struct { diff --git a/x/group/module/module.go b/x/group/module/module.go index 373361325f..4d42e0dbf1 100644 --- a/x/group/module/module.go +++ b/x/group/module/module.go @@ -9,9 +9,8 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "cosmossdk.io/core/appmodule" - modulev1 "cosmossdk.io/api/cosmos/group/module/v1" + "cosmossdk.io/core/appmodule" "cosmossdk.io/depinject" "github.com/cosmos/cosmos-sdk/baseapp" diff --git a/x/group/msgs.go b/x/group/msgs.go index 02e4a61026..f0fe8a9b53 100644 --- a/x/group/msgs.go +++ b/x/group/msgs.go @@ -1,14 +1,14 @@ package group import ( - proto "github.com/cosmos/gogoproto/proto" + "github.com/cosmos/gogoproto/proto" "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/tx" "github.com/cosmos/cosmos-sdk/x/group/codec" - errors "github.com/cosmos/cosmos-sdk/x/group/errors" + "github.com/cosmos/cosmos-sdk/x/group/errors" "github.com/cosmos/cosmos-sdk/x/group/internal/math" ) diff --git a/x/group/msgs_test.go b/x/group/msgs_test.go index 0b9ff53aa7..5b82d2de31 100644 --- a/x/group/msgs_test.go +++ b/x/group/msgs_test.go @@ -1,7 +1,7 @@ package group_test import ( - fmt "fmt" + "fmt" "testing" "time" diff --git a/x/group/testutil/expected_keepers.go b/x/group/testutil/expected_keepers.go index bec2cba833..aff1803e79 100644 --- a/x/group/testutil/expected_keepers.go +++ b/x/group/testutil/expected_keepers.go @@ -8,13 +8,13 @@ import ( "github.com/cosmos/cosmos-sdk/x/group" ) -// extends `AccountKeeper` from expected_keepers. +// AccountKeeper extends `AccountKeeper` from expected_keepers. type AccountKeeper interface { group.AccountKeeper } -// extends `BankKeeper` from expected_keepers. -// extends bank `MsgServer` to mock `Send` and to register handlers in MsgServiceRouter +// BankKeeper extends `BankKeeper` from expected_keepers and bank `MsgServer` to mock `Send` and +// to register handlers in MsgServiceRouter type BankKeeper interface { group.BankKeeper bank.MsgServer