fix custom signers

x/profile/module/module.go

@@ -229,17 +229,23 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 	return ModuleOutputs{ProfileKeeper: k, Module: m}
 }
 
-func ProvideCustomGetSigners() signing.CustomGetSigner {
+func ProvideCustomGetSigners(cdc address.Codec) signing.CustomGetSigner {
 	return signing.CustomGetSigner{
 		MsgType: proto.MessageName(&profile1.MsgAddValidatorOperatorAddress{}),
 		Fn: func(msg proto.Message) ([][]byte, error) {
 			testMsg, ok := msg.(*profile1.MsgAddValidatorOperatorAddress)
 			if !ok {
 				return nil, fmt.Errorf("invalid message type: %T", msg)
 			}
-			validatorSigner := testMsg.ValidatorAddress
-			operatorSigner := testMsg.OperatorAddress
-			return [][]byte{[]byte(validatorSigner), []byte(operatorSigner)}, nil
+			validatorSigner, err := cdc.StringToBytes(testMsg.ValidatorAddress)
+			if err != nil {
+				return nil, err
+			}
+			operatorSigner, err := cdc.StringToBytes(testMsg.OperatorAddress)
+			if err != nil {
+				return nil, err
+			}
+			return [][]byte{validatorSigner, operatorSigner}, nil
 		},
 	}
 }

x/profile/simulation/helpers.go

@@ -3,8 +3,11 @@ package simulation
 import (
 	"fmt"
 
+	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
+	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
+	"github.com/cosmos/cosmos-sdk/x/simulation"
 
 	"github.com/ignite/network/x/profile/keeper"
 )
@@ -21,3 +24,60 @@ func FindAccount(k *keeper.Keeper, accs []simtypes.Account, address string) (sim
 	}
 	return simAccount, nil
 }
+
+// generate a Tx with more than one signature
+func genAndDeliverTxWithSigners(txCtx simulation.OperationInput, accounts ...simtypes.Account) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
+	account := txCtx.AccountKeeper.GetAccount(txCtx.Context, txCtx.SimAccount.Address)
+	spendable := txCtx.Bankkeeper.SpendableCoins(txCtx.Context, account.GetAddress())
+
+	var (
+		accMap       = make(map[string]struct{})
+		accNumbers   = []uint64{account.GetAccountNumber()}
+		accSequences = []uint64{account.GetSequence()}
+		privs        = []cryptotypes.PrivKey{txCtx.SimAccount.PrivKey}
+	)
+	accMap[txCtx.SimAccount.Address.String()] = struct{}{}
+	for _, acc := range accounts {
+		if _, ok := accMap[acc.Address.String()]; ok {
+			continue
+		}
+		accMap[acc.Address.String()] = struct{}{}
+		account := txCtx.AccountKeeper.GetAccount(txCtx.Context, acc.Address)
+		accNumbers = append(accNumbers, account.GetAccountNumber())
+		accSequences = append(accSequences, account.GetSequence())
+		privs = append(privs, acc.PrivKey)
+	}
+
+	// feePayer is the first signer
+	coins, hasNeg := spendable.SafeSub(txCtx.CoinsSpentInMsg...)
+	if hasNeg {
+		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "message doesn't leave room for fees"), nil, nil
+	}
+
+	fees, err := simtypes.RandomFees(txCtx.R, txCtx.Context, coins)
+	if err != nil {
+		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to generate fees"), nil, err
+	}
+
+	tx, err := simtestutil.GenSignedMockTx(
+		txCtx.R,
+		txCtx.TxGen,
+		[]sdk.Msg{txCtx.Msg},
+		fees,
+		simtestutil.DefaultGenTxGas,
+		txCtx.Context.ChainID(),
+		accNumbers,
+		accSequences,
+		privs...,
+	)
+	if err != nil {
+		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to generate mock tx"), nil, err
+	}
+
+	_, _, err = txCtx.App.SimTxFinalizeBlock(txCtx.TxGen.TxEncoder(), tx)
+	if err != nil {
+		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to deliver tx"), nil, err
+	}
+
+	return simtypes.NewOperationMsg(txCtx.Msg, true, ""), nil, nil
+}

x/profile/simulation/validator.go

@@ -5,8 +5,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
-	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
-	simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	simtypes "github.com/cosmos/cosmos-sdk/types/simulation"
 	"github.com/cosmos/cosmos-sdk/x/simulation"
@@ -15,67 +13,15 @@ import (
 	"github.com/ignite/network/x/profile/types"
 )
 
-// generate a Tx with 2 signatures if validator account is not equal to operator address account
-func genAndDeliverTxWithRandFeesAddOpAddr(txCtx simulation.OperationInput, opSimAcc simtypes.Account) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
-	account := txCtx.AccountKeeper.GetAccount(txCtx.Context, txCtx.SimAccount.Address)
-	spendable := txCtx.Bankkeeper.SpendableCoins(txCtx.Context, account.GetAddress())
-	opAccout := txCtx.AccountKeeper.GetAccount(txCtx.Context, opSimAcc.Address)
-
-	accNumbers := []uint64{account.GetAccountNumber()}
-	accSequences := []uint64{account.GetSequence()}
-	privs := []cryptotypes.PrivKey{txCtx.SimAccount.PrivKey}
-	if account != opAccout {
-		accNumbers = append(accNumbers, opAccout.GetAccountNumber())
-		accSequences = append(accSequences, opAccout.GetSequence())
-		privs = append(privs, opSimAcc.PrivKey)
-	}
-
-	var fees sdk.Coins
-	var err error
-
-	coins, hasNeg := spendable.SafeSub(txCtx.CoinsSpentInMsg...)
-	if hasNeg {
-		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "message doesn't leave room for fees"), nil, err
-	}
-
-	fees, err = sample.Fees(txCtx.R, coins)
-	if err != nil {
-		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to generate fees"), nil, err
-	}
-
-	tx, err := simtestutil.GenSignedMockTx(
-		txCtx.R,
-		txCtx.TxGen,
-		[]sdk.Msg{txCtx.Msg},
-		fees,
-		simtestutil.DefaultGenTxGas,
-		txCtx.Context.ChainID(),
-		accNumbers,
-		accSequences,
-		privs...,
-	)
-	if err != nil {
-		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to generate mock tx"), nil, err
-	}
-
-	_, _, err = txCtx.App.SimDeliver(txCtx.TxGen.TxEncoder(), tx)
-	if err != nil {
-		return simtypes.NoOpMsg(txCtx.ModuleName, sdk.MsgTypeURL(txCtx.Msg), "unable to deliver tx"), nil, err
-	}
-
-	return simtypes.NewOperationMsg(txCtx.Msg, true, ""), nil, nil
-}
-
 func SimulateMsgAddValidatorOperatorAddress(
 	ak types.AccountKeeper,
 	bk types.BankKeeper,
 	txGen client.TxConfig,
 ) simtypes.Operation {
 	return func(r *rand.Rand, app *baseapp.BaseApp, ctx sdk.Context, accs []simtypes.Account, chainID string,
 	) (simtypes.OperationMsg, []simtypes.FutureOperation, error) {
-		simAccount, _ := simtypes.RandomAcc(r, accs)
-
 		// choose two addresses that are not equal
+		simAccount, _ := simtypes.RandomAcc(r, accs)
 		opAccount, _ := simtypes.RandomAcc(r, accs)
 		for simAccount.Address.Equals(opAccount.Address) {
 			opAccount, _ = simtypes.RandomAcc(r, accs)
@@ -99,7 +45,7 @@ func SimulateMsgAddValidatorOperatorAddress(
 			ModuleName:      types.ModuleName,
 			CoinsSpentInMsg: sdk.NewCoins(),
 		}
-		return genAndDeliverTxWithRandFeesAddOpAddr(txCtx, opAccount)
+		return genAndDeliverTxWithSigners(txCtx, opAccount)
 	}
 }