Remove dependency of types/module package on x/simulation

simapp/helpers/test_helpers.go

@@ -1,14 +1,14 @@
 package helpers
 
 import (
+	"github.com/cosmos/cosmos-sdk/types/module"
 	"math/rand"
 	"time"
 
 	"github.com/tendermint/tendermint/crypto"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
 )
 
 // SimAppChainID hardcoded chainID for simulation
@@ -29,7 +29,7 @@ func GenTx(msgs []sdk.Msg, feeAmt sdk.Coins, gas uint64, chainID string, accnums
 	// create a random length memo
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 
-	memo := simulation.RandStringOfLength(r, simulation.RandIntBetween(r, 0, 100))
+	memo := module.RandStringOfLength(r, module.RandIntBetween(r, 0, 100))
 
 	for i, p := range priv {
 		// use a empty chainID for ease of testing

simapp/state.go

@@ -22,11 +22,11 @@ import (
 // It panics if the user provides files for both of them.
 // If a file is not given for the genesis or the sim params, it creates a randomized one.
 func AppStateFn(cdc *codec.Codec, simManager *module.SimulationManager) simulation.AppStateFn {
-	return func(r *rand.Rand, accs []simulation.Account, config simulation.Config,
-	) (appState json.RawMessage, simAccs []simulation.Account, chainID string, genesisTimestamp time.Time) {
+	return func(r *rand.Rand, accs []module.Account, config simulation.Config,
+	) (appState json.RawMessage, simAccs []module.Account, chainID string, genesisTimestamp time.Time) {
 
 		if FlagGenesisTimeValue == 0 {
-			genesisTimestamp = simulation.RandTimestamp(r)
+			genesisTimestamp = module.RandTimestamp(r)
 		} else {
 			genesisTimestamp = time.Unix(FlagGenesisTimeValue, 0)
 		}
@@ -50,7 +50,7 @@ func AppStateFn(cdc *codec.Codec, simManager *module.SimulationManager) simulati
 			simAccs = accounts
 
 		case config.ParamsFile != "":
-			appParams := make(simulation.AppParams)
+			appParams := make(module.AppParams)
 			bz, err := ioutil.ReadFile(config.ParamsFile)
 			if err != nil {
 				panic(err)
@@ -60,7 +60,7 @@ func AppStateFn(cdc *codec.Codec, simManager *module.SimulationManager) simulati
 			appState, simAccs = AppStateRandomizedFn(simManager, r, cdc, accs, genesisTimestamp, appParams)
 
 		default:
-			appParams := make(simulation.AppParams)
+			appParams := make(module.AppParams)
 			appState, simAccs = AppStateRandomizedFn(simManager, r, cdc, accs, genesisTimestamp, appParams)
 		}
 
@@ -72,8 +72,8 @@ func AppStateFn(cdc *codec.Codec, simManager *module.SimulationManager) simulati
 // and creates the simulation params
 func AppStateRandomizedFn(
 	simManager *module.SimulationManager, r *rand.Rand, cdc *codec.Codec,
-	accs []simulation.Account, genesisTimestamp time.Time, appParams simulation.AppParams,
-) (json.RawMessage, []simulation.Account) {
+	accs []module.Account, genesisTimestamp time.Time, appParams module.AppParams,
+) (json.RawMessage, []module.Account) {
 	numAccs := int64(len(accs))
 	genesisState := NewDefaultGenesisState()
 
@@ -125,7 +125,7 @@ func AppStateRandomizedFn(
 
 // AppStateFromGenesisFileFn util function to generate the genesis AppState
 // from a genesis.json file.
-func AppStateFromGenesisFileFn(r io.Reader, cdc *codec.Codec, genesisFile string) (tmtypes.GenesisDoc, []simulation.Account) {
+func AppStateFromGenesisFileFn(r io.Reader, cdc *codec.Codec, genesisFile string) (tmtypes.GenesisDoc, []module.Account) {
 	bytes, err := ioutil.ReadFile(genesisFile)
 	if err != nil {
 		panic(err)
@@ -142,7 +142,7 @@ func AppStateFromGenesisFileFn(r io.Reader, cdc *codec.Codec, genesisFile string
 		cdc.MustUnmarshalJSON(appState[auth.ModuleName], &authGenesis)
 	}
 
-	newAccs := make([]simulation.Account, len(authGenesis.Accounts))
+	newAccs := make([]module.Account, len(authGenesis.Accounts))
 	for i, acc := range authGenesis.Accounts {
 		// Pick a random private key, since we don't know the actual key
 		// This should be fine as it's only used for mock Tendermint validators
@@ -155,7 +155,7 @@ func AppStateFromGenesisFileFn(r io.Reader, cdc *codec.Codec, genesisFile string
 		privKey := secp256k1.GenPrivKeySecp256k1(privkeySeed)
 
 		// create simulator accounts
-		simAcc := simulation.Account{PrivKey: privKey, PubKey: privKey.PubKey(), Address: acc.GetAddress()}
+		simAcc := module.Account{PrivKey: privKey, PubKey: privKey.PubKey(), Address: acc.GetAddress()}
 		newAccs[i] = simAcc
 	}
 

simapp/utils.go

@@ -49,9 +49,9 @@ func SetupSimulation(dirPrefix, dbName string) (simulation.Config, dbm.DB, strin
 
 // SimulationOperations retrieves the simulation params from the provided file path
 // and returns all the modules weighted operations
-func SimulationOperations(app App, cdc *codec.Codec, config simulation.Config) []simulation.WeightedOperation {
+func SimulationOperations(app App, cdc *codec.Codec, config simulation.Config) []module.WeightedOperation {
 	simState := module.SimulationState{
-		AppParams: make(simulation.AppParams),
+		AppParams: make(module.AppParams),
 		Cdc:       cdc,
 	}
 

x/simulation/account.go → types/module/account.go

@@ -1,4 +1,4 @@
-package simulation
+package module
 
 import (
 	"math/rand"

x/simulation/account_test.go → types/module/account_test.go

@@ -1,14 +1,15 @@
-package simulation_test
+package module_test
 
 import (
 	"math/rand"
 	"testing"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/types/module"
+
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
 )
 
 func TestRandomAccounts(t *testing.T) {
@@ -26,14 +27,14 @@ func TestRandomAccounts(t *testing.T) {
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			got := simulation.RandomAccounts(r, tt.n)
+			got := module.RandomAccounts(r, tt.n)
 			require.Equal(t, tt.want, len(got))
 			if tt.n == 0 {
 				return
 			}
-			acc, i := simulation.RandomAcc(r, got)
+			acc, i := module.RandomAcc(r, got)
 			require.True(t, acc.Equals(got[i]))
-			accFound, found := simulation.FindAccount(got, acc.Address)
+			accFound, found := module.FindAccount(got, acc.Address)
 			require.True(t, found)
 			require.True(t, accFound.Equals(acc))
 		})
@@ -43,9 +44,9 @@ func TestRandomAccounts(t *testing.T) {
 func TestFindAccountEmptySlice(t *testing.T) {
 	t.Parallel()
 	r := rand.New(rand.NewSource(time.Now().Unix()))
-	accs := simulation.RandomAccounts(r, 1)
+	accs := module.RandomAccounts(r, 1)
 	require.Equal(t, 1, len(accs))
-	acc, found := simulation.FindAccount(nil, accs[0].Address)
+	acc, found := module.FindAccount(nil, accs[0].Address)
 	require.False(t, found)
 	require.Nil(t, acc.Address)
 	require.Nil(t, acc.PrivKey)
@@ -68,7 +69,7 @@ func TestRandomFees(t *testing.T) {
 		tt := tt
 
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := simulation.RandomFees(r, sdk.Context{}, tt.spendableCoins)
+			got, err := module.RandomFees(r, sdk.Context{}, tt.spendableCoins)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("RandomFees() error = %v, wantErr %v", err, tt.wantErr)
 				return

types/module/module.go

@@ -33,7 +33,6 @@ import (
 
 	"github.com/gorilla/mux"
 	"github.com/spf13/cobra"
-
 	abci "github.com/tendermint/tendermint/abci/types"
 
 	"github.com/cosmos/cosmos-sdk/client/context"

x/simulation/rand_util.go → types/module/rand_util.go

@@ -1,4 +1,4 @@
-package simulation
+package module
 
 import (
 	"errors"

x/simulation/rand_util_test.go → types/module/rand_util_test.go

@@ -1,14 +1,15 @@
-package simulation_test
+package module_test
 
 import (
 	"math/rand"
 	"testing"
 	"time"
 
+	"github.com/cosmos/cosmos-sdk/types/module"
+
 	"github.com/stretchr/testify/require"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
 )
 
 func TestRandSubsetCoins(t *testing.T) {
@@ -25,7 +26,7 @@ func TestRandSubsetCoins(t *testing.T) {
 	for _, tt := range tests {
 		tt := tt
 		t.Run(tt.name, func(t *testing.T) {
-			got := simulation.RandSubsetCoins(tt.r, tt.coins)
+			got := module.RandSubsetCoins(tt.r, tt.coins)
 			gotStringRep := got.String()
 			sortedStringRep := got.Sort().String()
 			require.Equal(t, gotStringRep, sortedStringRep)
@@ -49,7 +50,7 @@ func TestRandStringOfLength(t *testing.T) {
 		tt := tt
 
 		t.Run(tt.name, func(t *testing.T) {
-			got := simulation.RandStringOfLength(r, tt.n)
+			got := module.RandStringOfLength(r, tt.n)
 			require.Equal(t, tt.want, len(got))
 		})
 	}

types/module/simulation.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/x/simulation"
 )
 
 // AppModuleSimulation defines the standard functions that every module should expose
@@ -18,16 +17,16 @@ type AppModuleSimulation interface {
 	GenerateGenesisState(input *SimulationState)
 
 	// content functions used to simulate governance proposals
-	ProposalContents(simState SimulationState) []simulation.WeightedProposalContent
+	ProposalContents(simState SimulationState) []WeightedProposalContent
 
 	// randomized module parameters for param change proposals
-	RandomizedParams(r *rand.Rand) []simulation.ParamChange
+	RandomizedParams(r *rand.Rand) []ParamChange
 
 	// register a func to decode the each module's defined types from their corresponding store key
 	RegisterStoreDecoder(sdk.StoreDecoderRegistry)
 
 	// simulation operations (i.e msgs) with their respective weight
-	WeightedOperations(simState SimulationState) []simulation.WeightedOperation
+	WeightedOperations(simState SimulationState) []WeightedOperation
 }
 
 // SimulationManager defines a simulation manager that provides the high level utility
@@ -49,8 +48,8 @@ func NewSimulationManager(modules ...AppModuleSimulation) *SimulationManager {
 
 // GetProposalContents returns each module's proposal content generator function
 // with their default operation weight and key.
-func (sm *SimulationManager) GetProposalContents(simState SimulationState) []simulation.WeightedProposalContent {
-	wContents := make([]simulation.WeightedProposalContent, 0, len(sm.Modules))
+func (sm *SimulationManager) GetProposalContents(simState SimulationState) []WeightedProposalContent {
+	wContents := make([]WeightedProposalContent, 0, len(sm.Modules))
 	for _, module := range sm.Modules {
 		wContents = append(wContents, module.ProposalContents(simState)...)
 	}
@@ -75,7 +74,7 @@ func (sm *SimulationManager) GenerateGenesisStates(simState *SimulationState) {
 
 // GenerateParamChanges generates randomized contents for creating params change
 // proposal transactions
-func (sm *SimulationManager) GenerateParamChanges(seed int64) (paramChanges []simulation.ParamChange) {
+func (sm *SimulationManager) GenerateParamChanges(seed int64) (paramChanges []ParamChange) {
 	r := rand.New(rand.NewSource(seed))
 
 	for _, module := range sm.Modules {
@@ -86,8 +85,8 @@ func (sm *SimulationManager) GenerateParamChanges(seed int64) (paramChanges []si
 }
 
 // WeightedOperations returns all the modules' weighted operations of an application
-func (sm *SimulationManager) WeightedOperations(simState SimulationState) []simulation.WeightedOperation {
-	wOps := make([]simulation.WeightedOperation, 0, len(sm.Modules))
+func (sm *SimulationManager) WeightedOperations(simState SimulationState) []WeightedOperation {
+	wOps := make([]WeightedOperation, 0, len(sm.Modules))
 	for _, module := range sm.Modules {
 		wOps = append(wOps, module.WeightedOperations(simState)...)
 	}
@@ -98,15 +97,15 @@ func (sm *SimulationManager) WeightedOperations(simState SimulationState) []simu
 // SimulationState is the input parameters used on each of the module's randomized
 // GenesisState generator function
 type SimulationState struct {
-	AppParams    simulation.AppParams
-	Cdc          *codec.Codec                         // application codec
-	Rand         *rand.Rand                           // random number
-	GenState     map[string]json.RawMessage           // genesis state
-	Accounts     []simulation.Account                 // simulation accounts
-	InitialStake int64                                // initial coins per account
-	NumBonded    int64                                // number of initially bonded accounts
-	GenTimestamp time.Time                            // genesis timestamp
-	UnbondTime   time.Duration                        // staking unbond time stored to use it as the slashing maximum evidence duration
-	ParamChanges []simulation.ParamChange             // simulated parameter changes from modules
-	Contents     []simulation.WeightedProposalContent // proposal content generator functions with their default weight and app sim key
+	AppParams    AppParams
+	Cdc          *codec.Codec               // application codec
+	Rand         *rand.Rand                 // random number
+	GenState     map[string]json.RawMessage // genesis state
+	Accounts     []Account                  // simulation accounts
+	InitialStake int64                      // initial coins per account
+	NumBonded    int64                      // number of initially bonded accounts
+	GenTimestamp time.Time                  // genesis timestamp
+	UnbondTime   time.Duration              // staking unbond time stored to use it as the slashing maximum evidence duration
+	ParamChanges []ParamChange              // simulated parameter changes from modules
+	Contents     []WeightedProposalContent  // proposal content generator functions with their default weight and app sim key
 }