From b019b209861a6f54cb704b5453ffa9542b2df4fd Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Wed, 28 Jun 2023 10:58:49 +0200 Subject: [PATCH] fix conflicts --- x/simulation/params.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/x/simulation/params.go b/x/simulation/params.go index 2d393241bdf3..f1346535eec3 100644 --- a/x/simulation/params.go +++ b/x/simulation/params.go @@ -151,11 +151,7 @@ func (w WeightedProposalContent) ContentSimulatorFn() simulation.ContentSimulato // Param change proposals // randomConsensusParams returns random simulation consensus parameters, it extracts the Evidence from the Staking genesis state. -<<<<<<< HEAD -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) *cmtproto.ConsensusParams { ->>>>>>> 9b2fd7bad (feat: add custom max gas for block for sim config (#16656)) +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 {