Sim refactor 2: move GenesisState generators to modules

.circleci/config.yml

@@ -26,9 +26,9 @@ commands:
             - go-src-v1-{{ .Revision }}
       - checkout
       - restore_cache:
-            name: "Restore go modules cache"
-            keys:
-              - go-mod-v2-{{ checksum "go.sum" }}
+          name: "Restore go modules cache"
+          keys:
+            - go-mod-v2-{{ checksum "go.sum" }}
       - run:
           name: << parameters.description >>
           command: |
@@ -40,7 +40,7 @@ jobs:
     steps:
       - checkout
       - run:
-          Name : "Build docs"
+          name: "Build docs"
           command: make build-docs
       - run:
           name: "Upload docs to S3"
@@ -87,56 +87,27 @@ jobs:
       - make:
           target: test_sim_import_export
           description: "Test application import/export simulation"
-      - run:
-          command: |
-            mkdir -p /tmp/errors
-            cp /tmp/**/app-simulation-seed* /tmp/errors/
-          when: on_fail
-      - store_artifacts:
-          path: /tmp/errors
 
   test_sim_after_import:
     executor: golang
     steps:
       - make:
           target: test_sim_after_import
           description: "Test simulation after import"
-      - run:
-          command: |
-            mkdir -p /tmp/errors
-            cp /tmp/**/app-simulation-seed* /tmp/errors/
-          when: on_fail
-      - store_artifacts:
-          path: /tmp/errors
 
   test_sim_multi_seed_long:
     executor: golang
     steps:
       - make:
           target: test_sim_multi_seed_long
           description: "Test multi-seed simulation (long)"
-      - run:
-          command: |
-            mkdir -p /tmp/errors
-            cp /tmp/**/app-simulation-seed* /tmp/errors/
-          when: on_fail
-      - store_artifacts:
-          path: /tmp/errors
 
   test_sim_multi_seed_short:
     executor: golang
     steps:
       - make:
           target: test_sim_multi_seed_short
           description: "Test multi-seed simulation (short)"
-      - run:
-          command: |
-            mkdir -p /tmp/errors
-            cp /tmp/**/app-simulation-seed* /tmp/errors/
-          when: on_fail
-
-      - store_artifacts:
-          path: /tmp/errors
 
   test_cover:
     executor: golang

CHANGELOG.md

@@ -61,9 +61,12 @@ longer panics if the store to load contains substores that we didn't explicitly
 * (simulation) [\#4824](https://github.com/cosmos/cosmos-sdk/issues/4824) PrintAllInvariants flag will print all failed invariants
 * (simulation) [\#4490](https://github.com/cosmos/cosmos-sdk/issues/4490) add `InitialBlockHeight` flag to resume a simulation from a given block
   * Support exporting the simulation stats to a given JSON file
-* (simulation) [\#4847](https://github.com/cosmos/cosmos-sdk/issues/4847) `SimApp` and simulation refactors
+* (simulation) [\#4847](https://github.com/cosmos/cosmos-sdk/issues/4847), [\#4838](https://github.com/cosmos/cosmos-sdk/pull/4838) `SimApp` and simulation refactors
   * Implement `SimulationManager` for executing modules' simulation functionalities in a modularized way
-  * Add `DecodeStore` to the `SimulationManager` for decoding each module's types
+  * Add `RegisterStoreDecoders` to the `SimulationManager` for decoding each module's types
+  * Add `GenerateGenesisStates` to the `SimulationManager` to generate a randomized `GenState` for each module
+  * Add `RandomizedParams` to the `SimulationManager` that registers each modules' parameters `Content` to simulate
+  `ParamChangeProposal`s
 * (simulation) [\#4893](https://github.com/cosmos/cosmos-sdk/issues/4893) Change SimApp keepers to be public and add getter functions for keys and codec
 * (simulation) [\#4906](https://github.com/cosmos/cosmos-sdk/issues/4906) Add simulation `Config` struct that wraps simulation flags
 * (store) [\#4792](https://github.com/cosmos/cosmos-sdk/issues/4792) panic on non-registered store

Makefile

@@ -105,7 +105,7 @@ test_race:
 test_sim_nondeterminism:
 	@echo "Running non-determinism test..."
 	@go test -mod=readonly $(SIMAPP) -run TestAppStateDeterminism -Enabled=true \
-	    -NumBlocks=100 -BlockSize=200 -Commit=true -v -timeout 24h
+	    -NumBlocks=100 -BlockSize=200 -Commit=true -Period=0 -v -timeout 24h
 
 test_sim_custom_genesis_fast:
 	@echo "Running custom genesis simulation..."

go.mod

@@ -6,7 +6,6 @@ require (
 	github.com/btcsuite/btcd v0.0.0-20190115013929-ed77733ec07d
 	github.com/cosmos/go-bip39 v0.0.0-20180618194314-52158e4697b8
 	github.com/cosmos/ledger-cosmos-go v0.10.3
-	github.com/cosmos/tools v0.0.0-20190729191304-444fa9c55188 // indirect
 	github.com/fortytw2/leaktest v1.3.0 // indirect
 	github.com/gogo/protobuf v1.2.1
 	github.com/golang/mock v1.3.1-0.20190508161146-9fa652df1129

go.sum

@@ -33,10 +33,6 @@ github.com/cosmos/ledger-cosmos-go v0.10.3 h1:Qhi5yTR5Pg1CaTpd00pxlGwNl4sFRdtK1J
 github.com/cosmos/ledger-cosmos-go v0.10.3/go.mod h1:J8//BsAGTo3OC/vDLjMRFLW6q0WAaXvHnVc7ZmE8iUY=
 github.com/cosmos/ledger-go v0.9.2 h1:Nnao/dLwaVTk1Q5U9THldpUMMXU94BOTWPddSmVB6pI=
 github.com/cosmos/ledger-go v0.9.2/go.mod h1:oZJ2hHAZROdlHiwTg4t7kP+GKIIkBT+o6c9QWFanOyI=
-github.com/cosmos/tools v0.0.0-20190729191304-444fa9c55188 h1:KZsNQXLq7ZUURaBjVrztEqZX+d7qpjQkS4a0jbCMHIY=
-github.com/cosmos/tools v0.0.0-20190729191304-444fa9c55188/go.mod h1:ycjJZ351OX/Y/DYgZqNn1WLCgpmVH7j29THN8vjbb9U=
-github.com/cosmos/tools/cmd/clog v0.0.0-20190722180430-ea942c183cba h1:YhVnGzBkE2TvfBW5fAYBdNVK/3bwTPYVbMaOIGRHFRY=
-github.com/cosmos/tools/cmd/clog v0.0.0-20190722180430-ea942c183cba/go.mod h1:TdPuAVaU2rc6K24ejr/AnGznt9Fd2qjtMoRrTO4uFrI=
 github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE=
 github.com/davecgh/go-spew v0.0.0-20171005155431-ecdeabc65495/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=

simapp/app.go

@@ -184,9 +184,9 @@ func NewSimApp(
 		bank.NewAppModule(app.BankKeeper, app.AccountKeeper),
 		crisis.NewAppModule(&app.CrisisKeeper),
 		supply.NewAppModule(app.SupplyKeeper, app.AccountKeeper),
-		distr.NewAppModule(app.DistrKeeper, app.SupplyKeeper),
 		gov.NewAppModule(app.GovKeeper, app.SupplyKeeper),
 		mint.NewAppModule(app.MintKeeper),
+		distr.NewAppModule(app.DistrKeeper, app.SupplyKeeper),
 		slashing.NewAppModule(app.SlashingKeeper, app.StakingKeeper),
 		staking.NewAppModule(app.StakingKeeper, app.AccountKeeper, app.SupplyKeeper),
 		nft.NewAppModule(app.NFTKeeper),
@@ -204,13 +204,30 @@ func NewSimApp(
 	app.mm.SetOrderInitGenesis(
 		genaccounts.ModuleName, distr.ModuleName, staking.ModuleName,
 		auth.ModuleName, bank.ModuleName, slashing.ModuleName, gov.ModuleName,
-		mint.ModuleName, supply.ModuleName, crisis.ModuleName, genutil.ModuleName,
+		mint.ModuleName, supply.ModuleName, crisis.ModuleName, nft.ModuleName,
+		genutil.ModuleName,
 	)
 
 	app.mm.RegisterInvariants(&app.CrisisKeeper)
 	app.mm.RegisterRoutes(app.Router(), app.QueryRouter())
 
-	app.sm = module.NewSimulationManager(app.mm.Modules)
+	// create the simulation manager and define the order of the modules for deterministic simulations
+	//
+	// NOTE: this is not required apps that don't use the simulator for fuzz testing
+	// transactions
+	app.sm = module.NewSimulationManager(
+		genaccounts.NewAppModule(app.AccountKeeper),
+		auth.NewAppModule(app.AccountKeeper),
+		bank.NewAppModule(app.BankKeeper, app.AccountKeeper),
+		supply.NewAppModule(app.SupplyKeeper, app.AccountKeeper),
+		gov.NewAppModule(app.GovKeeper, app.SupplyKeeper),
+		mint.NewAppModule(app.MintKeeper),
+		distr.NewAppModule(app.DistrKeeper, app.SupplyKeeper),
+		staking.NewAppModule(app.StakingKeeper, app.AccountKeeper, app.SupplyKeeper),
+		slashing.NewAppModule(app.SlashingKeeper, app.StakingKeeper),
+		// nft.NewAppModule(app.NFTKeeper),
+	)
+
 	app.sm.RegisterStoreDecoders()
 
 	// initialize stores