LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

chore: gofumpt (#11839)

Browse Source 
* fumpt using main not master...

* be more descriptive

* fumpt

* fix nits

Co-authored-by: Julien Robert <julien@rbrt.fr>
This commit is contained in:
Jacob Gadikian
2022-05-19 10:55:27 +02:00
committed by GitHub
co-authored by Julien Robert
parent bc2d553f77
commit 55054282d2
412 changed files with 1020 additions and 1059 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/group/client/testutil/query.go
+1 -2
View File
@@ -770,7 +770,7 @@ func (s *IntegrationTestSuite) TestTallyResult() {
member := s.voter
var commonFlags = []string{
commonFlags := []string{
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastBlock),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(s.cfg.BondDenom, sdk.NewInt(10))).String()),
@@ -872,5 +872,4 @@ func (s *IntegrationTestSuite) TestTallyResult() {
}
})
}
}
x/group/client/testutil/tx.go
+16 -1
View File
@@ -108,7 +108,7 @@ func (s *IntegrationTestSuite) SetupSuite() {
)
s.Require().NoError(err, out.String())
var txResp = sdk.TxResponse{}
txResp := sdk.TxResponse{}
s.Require().NoError(val.ClientCtx.Codec.UnmarshalJSON(out.Bytes(), &txResp), out.String())
s.Require().Equal(uint32(0), txResp.Code, out.String())
@@ -213,6 +213,7 @@ func (s *IntegrationTestSuite) TestTxCreateGroup() {
val := s.network.Validators[0]
clientCtx := val.ClientCtx
validMembers := fmt.Sprintf(`{"members": [{
"address": "%s",
"weight": "1",
@@ -365,6 +366,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupAdmin() {
clientCtx := val.ClientCtx
require := s.Require()
groupIDs := make([]string, 2)
for i := 0; i < 2; i++ {
validMembers := fmt.Sprintf(`{"members": [{
@@ -485,6 +487,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupMetadata() {
val := s.network.Validators[0]
clientCtx := val.ClientCtx
testCases := []struct {
name string
args []string
@@ -565,6 +568,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupMembers() {
val := s.network.Validators[0]
clientCtx := val.ClientCtx
weights := []string{"1", "1", "1"}
accounts := s.createAccounts(3)
@@ -687,6 +691,9 @@ func (s *IntegrationTestSuite) TestTxCreateGroupWithPolicy() {
val := s.network.Validators[0]
clientCtx := val.ClientCtx
validMembers := fmt.Sprintf(`{"members": [{
"address": "%s",
"weight": "1",
@@ -892,6 +899,7 @@ func (s *IntegrationTestSuite) TestTxCreateGroupPolicy() {
wrongAdmin := s.network.Validators[1].Address
clientCtx := val.ClientCtx
groupID := s.group.Id
testCases := []struct {
@@ -1059,6 +1067,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupPolicyAdmin() {
clientCtx := val.ClientCtx
groupPolicy := s.groupPolicies[3]
commonFlags := s.commonFlags
commonFlags = append(commonFlags, fmt.Sprintf("--%s=%d", flags.FlagGas, 300000))
@@ -1159,6 +1168,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupPolicyDecisionPolicy() {
clientCtx := val.ClientCtx
groupPolicy := s.groupPolicies[2]
commonFlags := s.commonFlags
commonFlags = append(commonFlags, fmt.Sprintf("--%s=%d", flags.FlagGas, 300000))
@@ -1304,6 +1314,7 @@ func (s *IntegrationTestSuite) TestTxUpdateGroupPolicyMetadata() {
clientCtx := val.ClientCtx
groupPolicy := s.groupPolicies[2]
commonFlags := s.commonFlags
commonFlags = append(commonFlags, fmt.Sprintf("--%s=%d", flags.FlagGas, 300000))
@@ -1417,6 +1428,7 @@ func (s *IntegrationTestSuite) TestTxSubmitProposal() {
val := s.network.Validators[0]
clientCtx := val.ClientCtx
testCases := []struct {
name string
args []string
@@ -1605,6 +1617,7 @@ func (s *IntegrationTestSuite) TestTxVote() {
val := s.network.Validators[0]
clientCtx := val.ClientCtx
ids := make([]string, 4)
weights := []string{"1", "1", "1"}
accounts := s.createAccounts(3)
@@ -1798,6 +1811,7 @@ func (s *IntegrationTestSuite) TestTxWithdrawProposal() {
val := s.network.Validators[0]
clientCtx := val.ClientCtx
ids := make([]string, 2)
for i := 0; i < 2; i++ {
@@ -1940,6 +1954,7 @@ func (s *IntegrationTestSuite) TestTxExec() {
clientCtx := val.ClientCtx
require := s.Require()
var proposalIDs []string
// create proposals and vote
for i := 0; i < 2; i++ {
x/group/genesis_test.go
-2
View File
@@ -18,7 +18,6 @@ var (
)
func TestGenesisStateValidate(t *testing.T) {
submittedAt := time.Now().UTC()
timeout := submittedAt.Add(time.Second * 1).UTC()
@@ -737,7 +736,6 @@ func TestGenesisStateValidate(t *testing.T) {
for _, tc := range testCases {
tc := tc
t.Run(tc.name, func(t *testing.T) {
err := tc.genesisState.Validate()
if tc.expErr {
require.Error(t, err)
x/group/internal/orm/indexer_test.go
+1 -2
View File
@@ -239,6 +239,7 @@ func TestIndexerOnDelete(t *testing.T) {
})
}
}
func TestIndexerOnUpdate(t *testing.T) {
myRowID := EncodeSequence(1)
@@ -377,7 +378,6 @@ func TestUniqueKeyAddFunc(t *testing.T) {
expErr *sdkerrors.Error
expExistingEntry []byte
}{
"create when not exists": {
srcKey: []byte("my-index-key"),
expExistingEntry: append(AddLengthPrefix([]byte("my-index-key")), myRowID...),
@@ -421,7 +421,6 @@ func TestMultiKeyAddFunc(t *testing.T) {
expErr *sdkerrors.Error
expExistingEntry []byte
}{
"create when not exists": {
srcKey: []byte("my-index-key"),
expExistingEntry: append(AddLengthPrefix([]byte("my-index-key")), myRowID...),
x/group/internal/orm/iterator.go
+1 -1
View File
@@ -155,7 +155,7 @@ func Paginate(
return nil, err
}
var end = offset + limit
end := offset + limit
var count uint64
var nextKey []byte
for {
x/group/internal/orm/iterator_test.go
-1
View File
@@ -317,7 +317,6 @@ func TestPaginate(t *testing.T) {
assert.EqualValues(t, spec.expPageRes.Total, res.Total)
assert.EqualValues(t, spec.expPageRes.NextKey, res.NextKey)
}
})
}
x/group/internal/orm/primary_key_test.go
-1
View File
@@ -223,7 +223,6 @@ func TestContains(t *testing.T) {
src PrimaryKeyed
exp bool
}{
"same object": {src: &obj, exp: true},
"clone": {
src: &testdata.TableModel{
x/group/internal/orm/table.go
+1 -1
View File
@@ -149,7 +149,7 @@ func assertValid(obj codec.ProtoMarshaler) error {
func (a table) Delete(store sdk.KVStore, rowID RowID) error {
pStore := prefix.NewStore(store, a.prefix[:])
var oldValue = reflect.New(a.model).Interface().(codec.ProtoMarshaler)
oldValue := reflect.New(a.model).Interface().(codec.ProtoMarshaler)
if err := a.GetOne(store, rowID, oldValue); err != nil {
return sdkerrors.Wrap(err, "load old value")
}
x/group/internal/orm/table_test.go
+3 -3
View File
@@ -97,7 +97,7 @@ func TestCreate(t *testing.T) {
ctx := NewMockContext()
store := ctx.KVStore(sdk.NewKVStoreKey("test"))
var anyPrefix = [2]byte{0x10}
anyPrefix := [2]byte{0x10}
myTable, err := newTable(anyPrefix, &testdata.TableModel{}, cdc)
require.NoError(t, err)
@@ -154,7 +154,7 @@ func TestUpdate(t *testing.T) {
ctx := NewMockContext()
store := ctx.KVStore(sdk.NewKVStoreKey("test"))
var anyPrefix = [2]byte{0x10}
anyPrefix := [2]byte{0x10}
myTable, err := newTable(anyPrefix, &testdata.TableModel{}, cdc)
require.NoError(t, err)
@@ -203,7 +203,7 @@ func TestDelete(t *testing.T) {
ctx := NewMockContext()
store := ctx.KVStore(sdk.NewKVStoreKey("test"))
var anyPrefix = [2]byte{0x10}
anyPrefix := [2]byte{0x10}
myTable, err := newTable(anyPrefix, &testdata.TableModel{}, cdc)
require.NoError(t, err)
x/group/internal/orm/types_test.go
+1 -1
View File
@@ -18,7 +18,7 @@ import (
func TestTypeSafeRowGetter(t *testing.T) {
storeKey := sdk.NewKVStoreKey("test")
ctx := NewMockContext()
var prefixKey = [2]byte{0x2}
prefixKey := [2]byte{0x2}
store := prefix.NewStore(ctx.KVStore(storeKey), prefixKey[:])
md := testdata.TableModel{
Id: 1,
x/group/keeper/genesis.go
-1
View File
@@ -40,7 +40,6 @@ func (k Keeper) InitGenesis(ctx types.Context, cdc codec.JSONCodec, data json.Ra
}
return []abci.ValidatorUpdate{}
}
func (k Keeper) ExportGenesis(ctx types.Context, cdc codec.JSONCodec) *group.GenesisState {
x/group/keeper/genesis_test.go
-2
View File
@@ -2,7 +2,6 @@ package keeper_test
import (
"context"
"encoding/json"
"testing"
"time"
@@ -192,7 +191,6 @@ func (s *GenesisTestSuite) TestInitExportGenesis() {
s.Require().Equal(genesisState.GroupSeq, exportedGenesisState.GroupSeq)
s.Require().Equal(genesisState.GroupPolicySeq, exportedGenesisState.GroupPolicySeq)
s.Require().Equal(genesisState.ProposalSeq, exportedGenesisState.ProposalSeq)
}
func (s *GenesisTestSuite) assertGroupPoliciesEqual(g *group.GroupPolicyInfo, other *group.GroupPolicyInfo) {
x/group/keeper/invariants.go
-1
View File
@@ -28,7 +28,6 @@ func GroupTotalWeightInvariant(keeper Keeper) sdk.Invariant {
}
func GroupTotalWeightInvariantHelper(ctx sdk.Context, key storetypes.StoreKey, groupTable orm.AutoUInt64Table, groupMemberByGroupIndex orm.Index) (string, bool) {
var msg string
var broken bool
x/group/keeper/invariants_test.go
-1
View File
@@ -47,7 +47,6 @@ func (s *invariantTestSuite) SetupSuite() {
s.ctx = sdkCtx
s.cdc = cdc
s.key = key
}
func (s *invariantTestSuite) TestGroupTotalWeightInvariant() {
x/group/keeper/keeper.go
-2
View File
@@ -211,7 +211,6 @@ func NewKeeper(storeKey storetypes.StoreKey, cdc codec.Codec, router *authmiddle
k.config = config
return k
}
// Logger returns a module-specific logger.
@@ -228,7 +227,6 @@ func (k Keeper) GetGroupSequence(ctx sdk.Context) uint64 {
func (k Keeper) iterateProposalsByVPEnd(ctx sdk.Context, endTime time.Time, cb func(proposal group.Proposal) (bool, error)) error {
timeBytes := sdk.FormatTimeBytes(endTime)
it, err := k.proposalsByVotingPeriodEnd.PrefixScan(ctx.KVStore(k.key), nil, timeBytes)
if err != nil {
return err
}
x/group/keeper/keeper_test.go
+5 -4
View File
@@ -222,7 +222,6 @@ func (s *TestSuite) TestCreateGroup() {
}
})
}
}
func (s *TestSuite) TestUpdateGroupAdmin() {
@@ -864,7 +863,6 @@ func (s *TestSuite) TestCreateGroupWithPolicy() {
}
})
}
}
func (s *TestSuite) TestCreateGroupPolicy() {
@@ -2831,6 +2829,7 @@ func (s *TestSuite) TestLeaveGroup() {
}
}
func (s *TestSuite) TestPruneProposals() {
addrs := s.addrs
expirationTime := time.Hour * 24 * 15 // 15 days
@@ -2880,7 +2879,8 @@ func (s *TestSuite) TestPruneProposals() {
func submitProposal(
ctx context.Context, s *TestSuite, msgs []sdk.Msg,
proposers []string) uint64 {
proposers []string,
) uint64 {
proposalReq := &group.MsgSubmitProposal{
GroupPolicyAddress: s.groupPolicyAddr.String(),
Proposers: proposers,
@@ -2895,7 +2895,8 @@ func submitProposal(
func submitProposalAndVote(
ctx context.Context, s *TestSuite, msgs []sdk.Msg,
proposers []string, voteOption group.VoteOption) uint64 {
proposers []string, voteOption group.VoteOption,
) uint64 {
s.Require().Greater(len(proposers), 0)
myProposalID := submitProposal(ctx, s, msgs, proposers)
x/group/keeper/msg_server.go
+7 -4
View File
@@ -105,7 +105,8 @@ func (k Keeper) UpdateGroupMembers(goCtx context.Context, req *group.MsgUpdateGr
if err := k.assertMetadataLength(req.MemberUpdates[i].Metadata, "group member metadata"); err != nil {
return err
}
groupMember := group.GroupMember{GroupId: req.GroupId,
groupMember := group.GroupMember{
GroupId: req.GroupId,
Member: &group.Member{
Address: req.MemberUpdates[i].Address,
Weight: req.MemberUpdates[i].Weight,
@@ -333,7 +334,7 @@ func (k Keeper) CreateGroupPolicy(goCtx context.Context, req *group.MsgCreateGro
// collision with an existing address.
for {
nextAccVal := k.groupPolicySeq.NextVal(ctx.KVStore(k.key))
var buf = make([]byte, 8)
buf := make([]byte, 8)
binary.BigEndian.PutUint64(buf, nextAccVal)
parentAcc := address.Module(group.ModuleName, []byte{GroupPolicyTablePrefix})
@@ -871,8 +872,10 @@ type authNGroupReq interface {
GetAdmin() string
}
type actionFn func(m *group.GroupInfo) error
type groupPolicyActionFn func(m *group.GroupPolicyInfo) error
type (
actionFn func(m *group.GroupInfo) error
groupPolicyActionFn func(m *group.GroupPolicyInfo) error
)
// doUpdateGroupPolicy first makes sure that the group policy admin initiated the group policy update,
// before performing the group policy update and emitting an event.
x/group/module/abci_test.go
+3 -5
View File
@@ -315,7 +315,6 @@ func TestEndBlockerPruning(t *testing.T) {
}
})
}
}
func TestEndBlockerTallying(t *testing.T) {
@@ -505,9 +504,7 @@ func TestEndBlockerTallying(t *testing.T) {
}
}
func submitProposal(
app *simapp.SimApp, ctx context.Context, msgs []sdk.Msg,
proposers []string, groupPolicyAddr sdk.AccAddress) (uint64, error) {
func submitProposal(app *simapp.SimApp, ctx context.Context, msgs []sdk.Msg, proposers []string, groupPolicyAddr sdk.AccAddress) (uint64, error) {
proposalReq := &group.MsgSubmitProposal{
GroupPolicyAddress: groupPolicyAddr.String(),
Proposers: proposers,
@@ -527,7 +524,8 @@ func submitProposal(
func submitProposalAndVote(
app *simapp.SimApp, ctx context.Context, msgs []sdk.Msg,
proposers []string, groupPolicyAddr sdk.AccAddress, voteOption group.VoteOption) (uint64, error) {
proposers []string, groupPolicyAddr sdk.AccAddress, voteOption group.VoteOption,
) (uint64, error) {
myProposalID, err := submitProposal(app, ctx, msgs, proposers, groupPolicyAddr)
if err != nil {
return 0, err
x/group/msgs.go
+12 -8
View File
@@ -139,7 +139,6 @@ func (m MsgUpdateGroupMetadata) GetSigners() []sdk.AccAddress {
func (m MsgUpdateGroupMetadata) ValidateBasic() error {
if m.GroupId == 0 {
return sdkerrors.Wrap(errors.ErrEmpty, "group id")
}
_, err := sdk.AccAddressFromBech32(m.Admin)
if err != nil {
@@ -183,7 +182,6 @@ func (m MsgUpdateGroupMembers) GetSigners() []sdk.AccAddress {
func (m MsgUpdateGroupMembers) ValidateBasic() error {
if m.GroupId == 0 {
return sdkerrors.Wrap(errors.ErrEmpty, "group id")
}
_, err := sdk.AccAddressFromBech32(m.Admin)
if err != nil {
@@ -204,8 +202,10 @@ func (m *MsgUpdateGroupMembers) GetGroupID() uint64 {
return m.GroupId
}
var _ sdk.Msg = &MsgCreateGroupWithPolicy{}
var _ types.UnpackInterfacesMessage = MsgCreateGroupWithPolicy{}
var (
_ sdk.Msg = &MsgCreateGroupWithPolicy{}
_ types.UnpackInterfacesMessage = MsgCreateGroupWithPolicy{}
)
// NewMsgCreateGroupWithPolicy creates a new MsgCreateGroupWithPolicy.
func NewMsgCreateGroupWithPolicy(admin string, members []MemberRequest, groupMetadata string, groupPolicyMetadata string, groupPolicyAsAdmin bool, decisionPolicy DecisionPolicy) (*MsgCreateGroupWithPolicy, error) {
@@ -379,8 +379,10 @@ func (m MsgUpdateGroupPolicyAdmin) ValidateBasic() error {
return nil
}
var _ sdk.Msg = &MsgUpdateGroupPolicyDecisionPolicy{}
var _ types.UnpackInterfacesMessage = MsgUpdateGroupPolicyDecisionPolicy{}
var (
_ sdk.Msg = &MsgUpdateGroupPolicyDecisionPolicy{}
_ types.UnpackInterfacesMessage = MsgUpdateGroupPolicyDecisionPolicy{}
)
// NewMsgUpdateGroupPolicyDecisionPolicy creates a new MsgUpdateGroupPolicyDecisionPolicy.
func NewMsgUpdateGroupPolicyDecisionPolicy(admin sdk.AccAddress, address sdk.AccAddress, decisionPolicy DecisionPolicy) (*MsgUpdateGroupPolicyDecisionPolicy, error) {
@@ -510,8 +512,10 @@ func (m MsgUpdateGroupPolicyMetadata) ValidateBasic() error {
return nil
}
var _ sdk.Msg = &MsgCreateGroupPolicy{}
var _ types.UnpackInterfacesMessage = MsgCreateGroupPolicy{}
var (
_ sdk.Msg = &MsgCreateGroupPolicy{}
_ types.UnpackInterfacesMessage = MsgCreateGroupPolicy{}
)
// NewMsgCreateGroupPolicy creates a new MsgCreateGroupPolicy.
func NewMsgCreateGroupPolicy(admin sdk.AccAddress, group uint64, metadata string, decisionPolicy DecisionPolicy) (*MsgCreateGroupPolicy, error) {
x/group/proposal.go
-1
View File
@@ -8,7 +8,6 @@ import (
func (p *Proposal) GetMsgs() ([]sdk.Msg, error) {
return tx.GetMsgs(p.Messages, "proposal")
}
func (p *Proposal) SetMsgs(msgs []sdk.Msg) error {
x/group/simulation/genesis.go
-1
View File
@@ -147,7 +147,6 @@ func getVoteOption(index int) group.VoteOption {
// RandomizedGenState generates a random GenesisState for the group module.
func RandomizedGenState(simState *module.SimulationState) {
// groups
var groups []*group.GroupInfo
simState.AppParams.GetOrGenerate(
x/group/simulation/genesis_test.go
-1
View File
@@ -43,5 +43,4 @@ func TestRandomizedGenState(t *testing.T) {
require.Equal(t, int(groupGenesis.ProposalSeq), len(simState.Accounts))
require.Len(t, groupGenesis.Proposals, len(simState.Accounts))
require.Len(t, groupGenesis.Votes, len(simState.Accounts))
}
x/group/simulation/operations.go
+48 -26
View File
@@ -81,7 +81,8 @@ const (
// WeightedOperations returns all the operations from the module with their respective weights
func WeightedOperations(
appParams simtypes.AppParams, cdc codec.JSONCodec, ak group.AccountKeeper,
bk group.BankKeeper, k keeper.Keeper, appCdc cdctypes.AnyUnpacker) simulation.WeightedOperations {
bk group.BankKeeper, k keeper.Keeper, appCdc cdctypes.AnyUnpacker,
) simulation.WeightedOperations {
var (
weightMsgCreateGroup int
weightMsgUpdateGroupAdmin int
@@ -243,7 +244,8 @@ func WeightedOperations(
// SimulateMsgCreateGroup generates a MsgCreateGroup with random values
func SimulateMsgCreateGroup(ak group.AccountKeeper, bk group.BankKeeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
acc, _ := simtypes.RandomAcc(r, accounts)
account := ak.GetAccount(ctx, acc.Address)
accAddr := acc.Address.String()
@@ -284,7 +286,8 @@ func SimulateMsgCreateGroup(ak group.AccountKeeper, bk group.BankKeeper) simtype
// SimulateMsgCreateGroupWithPolicy generates a MsgCreateGroupWithPolicy with random values
func SimulateMsgCreateGroupWithPolicy(ak group.AccountKeeper, bk group.BankKeeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
acc, _ := simtypes.RandomAcc(r, accounts)
account := ak.GetAccount(ctx, acc.Address)
accAddr := acc.Address.String()
@@ -342,7 +345,8 @@ func SimulateMsgCreateGroupWithPolicy(ak group.AccountKeeper, bk group.BankKeepe
// SimulateMsgCreateGroupPolicy generates a NewMsgCreateGroupPolicy with random values
func SimulateMsgCreateGroupPolicy(ak group.AccountKeeper, bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
groupInfo, acc, account, err := randomGroup(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgCreateGroupPolicy, ""), nil, err
@@ -401,7 +405,8 @@ func SimulateMsgCreateGroupPolicy(ak group.AccountKeeper, bk group.BankKeeper, k
// SimulateMsgSubmitProposal generates a NewMsgSubmitProposal with random values
func SimulateMsgSubmitProposal(ak group.AccountKeeper, bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
g, groupPolicy, _, _, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgSubmitProposal, ""), nil, err
@@ -474,7 +479,8 @@ func SimulateMsgSubmitProposal(ak group.AccountKeeper, bk group.BankKeeper, k ke
// SimulateMsgUpdateGroupAdmin generates a MsgUpdateGroupAdmin with random values
func SimulateMsgUpdateGroupAdmin(ak group.AccountKeeper, bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
groupInfo, acc, account, err := randomGroup(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgUpdateGroupAdmin, ""), nil, err
@@ -532,7 +538,8 @@ func SimulateMsgUpdateGroupAdmin(ak group.AccountKeeper, bk group.BankKeeper, k
// SimulateMsgUpdateGroupMetadata generates a MsgUpdateGroupMetadata with random values
func SimulateMsgUpdateGroupMetadata(ak group.AccountKeeper, bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
groupInfo, acc, account, err := randomGroup(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgUpdateGroupMetadata, ""), nil, err
@@ -580,9 +587,11 @@ func SimulateMsgUpdateGroupMetadata(ak group.AccountKeeper, bk group.BankKeeper,
// SimulateMsgUpdateGroupMembers generates a MsgUpdateGroupMembers with random values
func SimulateMsgUpdateGroupMembers(ak group.AccountKeeper,
bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
bk group.BankKeeper, k keeper.Keeper,
) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
groupInfo, acc, account, err := randomGroup(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgUpdateGroupMembers, ""), nil, err
@@ -658,7 +667,8 @@ func SimulateMsgUpdateGroupMembers(ak group.AccountKeeper,
// SimulateMsgUpdateGroupPolicyAdmin generates a MsgUpdateGroupPolicyAdmin with random values
func SimulateMsgUpdateGroupPolicyAdmin(ak group.AccountKeeper, bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
_, groupPolicy, acc, account, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgUpdateGroupPolicyAdmin, ""), nil, err
@@ -715,9 +725,11 @@ func SimulateMsgUpdateGroupPolicyAdmin(ak group.AccountKeeper, bk group.BankKeep
// // SimulateMsgUpdateGroupPolicyDecisionPolicy generates a NewMsgUpdateGroupPolicyDecisionPolicy with random values
func SimulateMsgUpdateGroupPolicyDecisionPolicy(ak group.AccountKeeper,
bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
bk group.BankKeeper, k keeper.Keeper,
) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
_, groupPolicy, acc, account, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgUpdateGroupPolicyDecisionPolicy, ""), nil, err
@@ -773,9 +785,11 @@ func SimulateMsgUpdateGroupPolicyDecisionPolicy(ak group.AccountKeeper,
// // SimulateMsgUpdateGroupPolicyMetadata generates a MsgUpdateGroupPolicyMetadata with random values
func SimulateMsgUpdateGroupPolicyMetadata(ak group.AccountKeeper,
bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
bk group.BankKeeper, k keeper.Keeper,
) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
_, groupPolicy, acc, account, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgUpdateGroupPolicyMetadata, ""), nil, err
@@ -823,9 +837,11 @@ func SimulateMsgUpdateGroupPolicyMetadata(ak group.AccountKeeper,
// SimulateMsgWithdrawProposal generates a MsgWithdrawProposal with random values
func SimulateMsgWithdrawProposal(ak group.AccountKeeper,
bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
bk group.BankKeeper, k keeper.Keeper,
) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
g, groupPolicy, _, _, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgWithdrawProposal, ""), nil, err
@@ -908,7 +924,6 @@ func SimulateMsgWithdrawProposal(ak group.AccountKeeper,
[]uint64{proposerAcc.GetSequence()},
proposer.PrivKey,
)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgUpdateGroupPolicyMetadata, "unable to generate mock tx"), nil, err
}
@@ -928,9 +943,11 @@ func SimulateMsgWithdrawProposal(ak group.AccountKeeper,
// SimulateMsgVote generates a MsgVote with random values
func SimulateMsgVote(ak group.AccountKeeper,
bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
bk group.BankKeeper, k keeper.Keeper,
) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
g, groupPolicy, _, _, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(group.ModuleName, TypeMsgVote, ""), nil, err
@@ -1031,9 +1048,11 @@ func SimulateMsgVote(ak group.AccountKeeper,
// // SimulateMsgExec generates a MsgExec with random values
func SimulateMsgExec(ak group.AccountKeeper,
bk group.BankKeeper, k keeper.Keeper) simtypes.Operation {
bk group.BankKeeper, k keeper.Keeper,
) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
_, groupPolicy, acc, account, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
return simtypes.NoOpMsg(TypeMsgExec, TypeMsgExec, ""), nil, err
@@ -1107,8 +1126,8 @@ func SimulateMsgExec(ak group.AccountKeeper,
// SimulateMsgLeaveGroup generates a MsgLeaveGroup with random values
func SimulateMsgLeaveGroup(k keeper.Keeper, ak group.AccountKeeper, bk group.BankKeeper) simtypes.Operation {
return func(
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
r *rand.Rand, app *baseapp.BaseApp, sdkCtx sdk.Context, accounts []simtypes.Account, chainID string,
) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
ctx := sdk.WrapSDKContext(sdkCtx)
groupInfo, policyInfo, _, _, err := randomGroupPolicy(r, k, ak, sdkCtx, accounts)
if err != nil {
@@ -1164,7 +1183,8 @@ func SimulateMsgLeaveGroup(k keeper.Keeper, ak group.AccountKeeper, bk group.Ban
}
func randomGroup(r *rand.Rand, k keeper.Keeper, ak group.AccountKeeper,
ctx sdk.Context, accounts []simtypes.Account) (groupInfo *group.GroupInfo, acc simtypes.Account, account authtypes.AccountI, err error) {
ctx sdk.Context, accounts []simtypes.Account,
) (groupInfo *group.GroupInfo, acc simtypes.Account, account authtypes.AccountI, err error) {
groupID := k.GetGroupSequence(ctx)
switch {
@@ -1201,7 +1221,8 @@ func randomGroup(r *rand.Rand, k keeper.Keeper, ak group.AccountKeeper,
}
func randomGroupPolicy(r *rand.Rand, k keeper.Keeper, ak group.AccountKeeper,
ctx sdk.Context, accounts []simtypes.Account) (groupInfo *group.GroupInfo, groupPolicyInfo *group.GroupPolicyInfo, acc simtypes.Account, account authtypes.AccountI, err error) {
ctx sdk.Context, accounts []simtypes.Account,
) (groupInfo *group.GroupInfo, groupPolicyInfo *group.GroupPolicyInfo, acc simtypes.Account, account authtypes.AccountI, err error) {
groupInfo, _, _, err = randomGroup(r, k, ak, ctx, accounts)
if err != nil {
return nil, nil, simtypes.Account{}, nil, err
@@ -1232,7 +1253,8 @@ func randomGroupPolicy(r *rand.Rand, k keeper.Keeper, ak group.AccountKeeper,
}
func randomMember(r *rand.Rand, k keeper.Keeper, ak group.AccountKeeper,
ctx context.Context, accounts []simtypes.Account, groupID uint64) (acc simtypes.Account, account authtypes.AccountI, err error) {
ctx context.Context, accounts []simtypes.Account, groupID uint64,
) (acc simtypes.Account, account authtypes.AccountI, err error) {
res, err := k.GroupMembers(ctx, &group.QueryGroupMembersRequest{
GroupId: groupID,
})
x/group/types.go
+2 -3
View File
@@ -231,7 +231,8 @@ var _ orm.Validateable = GroupPolicyInfo{}
// NewGroupPolicyInfo creates a new GroupPolicyInfo instance
func NewGroupPolicyInfo(address sdk.AccAddress, group uint64, admin sdk.AccAddress, metadata string,
version uint64, decisionPolicy DecisionPolicy, createdAt time.Time) (GroupPolicyInfo, error) {
version uint64, decisionPolicy DecisionPolicy, createdAt time.Time,
) (GroupPolicyInfo, error) {
p := GroupPolicyInfo{
Address: address.String(),
GroupId: group,
@@ -368,7 +369,6 @@ func MemberToMemberRequest(m *Member) MemberRequest {
}
func (p Proposal) ValidateBasic() error {
if p.Id == 0 {
return sdkerrors.Wrap(errors.ErrEmpty, "proposal id")
}
@@ -412,7 +412,6 @@ func (v Vote) PrimaryKeyFields() []interface{} {
var _ orm.Validateable = Vote{}
func (v Vote) ValidateBasic() error {
_, err := sdk.AccAddressFromBech32(v.Voter)
if err != nil {
return sdkerrors.Wrap(err, "voter")