feat: add custom max gas for block for sim config (backport cosmos#16656

) (cosmos#16731) Co-authored-by: mmsqe <[email protected]> Co-authored-by: marbar3778 <[email protected]>
agoric-labs · Sep 28, 2024 · d545254 · d545254
1 parent e7b445a
commit d545254
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -38,6 +38,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## [Unreleased]
 
+### Features
+
+* (sims) [#16656](https://github.com/cosmos/cosmos-sdk/pull/16656) Add custom max gas for block for sim config with unlimited as default.
+
 ### Improvements
 
 * (deps) [#16553](https://github.com/cosmos/cosmos-sdk/pull/16553) Bump CometBFT to [v0.34.29](https://github.com/cometbft/cometbft/blob/v0.34.29/CHANGELOG.md#v03429).

diff --git a/types/simulation/config.go b/types/simulation/config.go
@@ -33,12 +33,6 @@ func (c Config) shallowCopy() Config {
 	return c
 }
 
-// With sets the values of t, seed, and fuzzSeed in a copy of the Config and returns the copy.
-func (c Config) With(tb testing.TB, seed int64, fuzzSeed []byte) Config {
-	tb.Helper()
-	r := c.shallowCopy()
-	r.TB = tb
-	r.Seed = seed
-	r.FuzzSeed = fuzzSeed
-	return r
+	DBBackend   string // custom db backend type
+	BlockMaxGas int64  // custom max gas for block
 }
diff --git a/x/simulation/params.go b/x/simulation/params.go
@@ -184,7 +184,7 @@ func (w WeightedProposalContent) ContentSimulatorFn() simulation.ContentSimulato
 // Consensus Params
 
 // randomConsensusParams returns random simulation consensus parameters, it extracts the Evidence from the Staking genesis state.
-func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSONCodec) *abci.ConsensusParams {
+func randomConsensusParams(r *rand.Rand, appState json.RawMessage, cdc codec.JSONCodec, maxGas int64) *abci.ConsensusParams {
 	var genesisState map[string]json.RawMessage
 	err := json.Unmarshal(appState, &genesisState)
 	if err != nil {

diff --git a/x/simulation/simulate.go b/x/simulation/simulate.go
@@ -37,8 +37,12 @@ func initChain(
 	config simulation.Config,
 	cdc codec.JSONCodec,
 ) (mockValidators, time.Time, []simulation.Account, string) {
+	blockMaxGas := int64(-1)
+	if config.BlockMaxGas > 0 {
+		blockMaxGas = config.BlockMaxGas
+	}
 	appState, accounts, chainID, genesisTimestamp := appStateFn(r, accounts, config)
-	consensusParams := randomConsensusParams(r, appState, cdc)
+	consensusParams := randomConsensusParams(r, appState, cdc, blockMaxGas)
 	req := abci.RequestInitChain{
 		AppStateBytes:   appState,
 		ChainId:         chainID,