Revert "Add consensus params into Simulation (#6002)" (#6046)

This reverts commit 6504868.
cosmos · Apr 21, 2020 · 37c92c5 · 37c92c5
1 parent 3ee975c
commit 37c92c5
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 67 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -219,7 +219,6 @@ functionality that requires an online connection.
 * (types/rest) [\#5900](https://github.com/cosmos/cosmos-sdk/pull/5900) Add Check*Error function family to spare developers from replicating tons of boilerplate code.
 * (x/evidence) [\#5952](https://github.com/cosmos/cosmos-sdk/pull/5952) Tendermint Consensus parameters can now be changed via parameter change proposals through `x/gov`.
 * (x/auth/ante) [\#6040](https://github.com/cosmos/cosmos-sdk/pull/6040) `AccountKeeper` interface used for `NewAnteHandler` and handler's decorators to add support of using custom `AccountKeeper` implementations.
-* (simulation) [\#6002](https://github.com/cosmos/cosmos-sdk/pull/6002) Add randomized consensus params into simulation.
 
 ## [v0.38.3] - 2020-04-09
 

diff --git a/client/cmd_test.go b/client/cmd_test.go
@@ -37,12 +37,12 @@ func TestValidateCmd(t *testing.T) {
 		args    []string
 		wantErr bool
 	}{
-		{"misspelled command", []string{"COMMISSION"}, true},
+		{"misspelled command", []string{"commission"}, true}, // nolint: misspell
 		{"no command provided", []string{}, false},
-		{"help flag", []string{"COMMISSION", "--help"}, false},
-		{"shorthand help flag", []string{"COMMISSION", "-h"}, false},
+		{"help flag", []string{"commission", "--help"}, false},       // nolint: misspell
+		{"shorthand help flag", []string{"commission", "-h"}, false}, // nolint: misspell
 		{"flag only, no command provided", []string{"--gas", "1000atom"}, false},
-		{"flag and misspelled command", []string{"--gas", "1000atom", "COMMISSION"}, true},
+		{"flag and misspelled command", []string{"--gas", "1000atom", "comission"}, true}, // nolint: misspell
 	}
 
 	for _, tt := range tests {

diff --git a/x/ibc/09-localhost/types/localhost_test.go b/x/ibc/09-localhost/types/localhost_test.go
@@ -5,12 +5,11 @@ import (
 
 	"github.com/stretchr/testify/suite"
 
-	dbm "github.com/tendermint/tm-db"
-
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/store/cachekv"
 	"github.com/cosmos/cosmos-sdk/store/dbadapter"
 	commitmenttypes "github.com/cosmos/cosmos-sdk/x/ibc/23-commitment/types"
+	dbm "github.com/tendermint/tm-db"
 )
 
 const (

diff --git a/x/simulation/params.go b/x/simulation/params.go
@@ -1,18 +1,10 @@
 package simulation
 
 import (
-	"encoding/json"
 	"fmt"
 	"math/rand"
 
-	"github.com/tendermint/tendermint/types"
-
-	"github.com/tendermint/go-amino"
-	abci "github.com/tendermint/tendermint/abci/types"
-
-	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/simulation"
-	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
 const (
@@ -150,33 +142,3 @@ func (w WeightedProposalContent) DefaultWeight() int {
 func (w WeightedProposalContent) ContentSimulatorFn() simulation.ContentSimulatorFn {
 	return w.contentSimulatorFn
 }
-
-//-----------------------------------------------------------------------------
-// Param change proposals
-
-// RandomParams returns random simulation consensus parameters, it extracts the Evidence from the Staking genesis state.
-func RandomConsensusParams(r *rand.Rand, appState json.RawMessage) *abci.ConsensusParams {
-	cdc := amino.NewCodec()
-
-	var genesisState map[string]json.RawMessage
-	cdc.UnmarshalJSON(appState, &genesisState)
-
-	stakingGenesisState := stakingtypes.GetGenesisStateFromAppState(cdc, genesisState)
-
-	consensusParams := &abci.ConsensusParams{
-		Block: &abci.BlockParams{
-			MaxBytes: int64(simulation.RandIntBetween(r, 20000000, 30000000)),
-			MaxGas:   -1,
-		},
-		Validator: &abci.ValidatorParams{
-			PubKeyTypes: []string{types.ABCIPubKeyTypeSecp256k1, types.ABCIPubKeyTypeEd25519},
-		},
-		Evidence: &abci.EvidenceParams{
-			MaxAgeNumBlocks: int64(stakingGenesisState.Params.UnbondingTime / AverageBlockTime),
-			MaxAgeDuration:  stakingGenesisState.Params.UnbondingTime,
-		},
-	}
-	fmt.Printf("Selected randomly generated consensus parameters:\n%s\n", codec.MustMarshalJSONIndent(cdc, consensusParams))
-
-	return consensusParams
-}
diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go
@@ -17,8 +17,6 @@ import (
 	"github.com/cosmos/cosmos-sdk/types/simulation"
 )
 
-const AverageBlockTime = 6 * time.Second
-
 // initialize the chain for the simulation
 func initChain(
 	r *rand.Rand, params Params, accounts []simulation.Account, app *baseapp.BaseApp,
@@ -27,12 +25,9 @@ func initChain(
 
 	appState, accounts, chainID, genesisTimestamp := appStateFn(r, accounts, config)
 
-	consensusParams := RandomConsensusParams(r, appState)
-
 	req := abci.RequestInitChain{
-		AppStateBytes:   appState,
-		ChainId:         chainID,
-		ConsensusParams: consensusParams,
+		AppStateBytes: appState,
+		ChainId:       chainID,
 	}
 	res := app.InitChain(req)
 	validators := newMockValidators(r, res.Validators, params)
@@ -113,7 +108,7 @@ func SimulateFromSeed(
 
 	// These are operations which have been queued by previous operations
 	operationQueue := NewOperationQueue()
-	var timeOperationQueue []simulation.FutureOperation
+	timeOperationQueue := []simulation.FutureOperation{}
 
 	logWriter := NewLogWriter(testingMode)
 

diff --git a/x/staking/types/genesis.go b/x/staking/types/genesis.go
@@ -1,9 +1,6 @@
 package types
 
 import (
-	"encoding/json"
-
-	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
@@ -40,14 +37,3 @@ func DefaultGenesisState() GenesisState {
 		Params: DefaultParams(),
 	}
 }
-
-// GetGenesisStateFromAppState returns x/staking GenesisState given raw application
-// genesis state.
-func GetGenesisStateFromAppState(cdc *codec.Codec, appState map[string]json.RawMessage) GenesisState {
-	var genesisState GenesisState
-	if appState[ModuleName] != nil {
-		cdc.MustUnmarshalJSON(appState[ModuleName], &genesisState)
-	}
-
-	return genesisState
-}