Testing: fix block proposer and allow Default gas to be modified (bac…

…kport #2657) (#2683) * fix(testing): fix block proposer and allow Default gas to be modified (#2657) * carry block proposer, and allow Default gas to be modified * add changelog entry Co-authored-by: Federico Kunze Küllmer <[email protected]> Co-authored-by: colin axnér <[email protected]> Co-authored-by: Carlos Rodriguez <[email protected]> (cherry picked from commit f69761d) # Conflicts: # CHANGELOG.md * Update CHANGELOG.md Co-authored-by: Ramiro Carlucho <[email protected]> Co-authored-by: Federico Kunze Küllmer <[email protected]>
cosmos · Nov 5, 2022 · 035e174 · 035e174
1 parent f450a21
commit 035e174
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -48,6 +48,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
+* (testing) [\#2657](https://github.com/cosmos/ibc-go/pull/2657) Carry `ProposerAddress` through committed blocks. Allow `DefaultGenTxGas` to be modified.
+
 ### Features
 
 * (apps/transfer) [\#2595](https://github.com/cosmos/ibc-go/pull/2595) Adding optional memo field to `FungibleTokenPacketData` and `MsgTransfer`.

diff --git a/testing/chain.go b/testing/chain.go
@@ -291,6 +291,7 @@ func (chain *TestChain) NextBlock() {
 		Time:               chain.CurrentHeader.Time,
 		ValidatorsHash:     chain.Vals.Hash(),
 		NextValidatorsHash: chain.NextVals.Hash(),
+		ProposerAddress:    chain.CurrentHeader.ProposerAddress,
 	}
 
 	chain.App.BeginBlock(abci.RequestBeginBlock{Header: chain.CurrentHeader})

diff --git a/testing/simapp/helpers/test_helpers.go b/testing/simapp/helpers/test_helpers.go
@@ -12,11 +12,11 @@ import (
 	authsign "github.com/cosmos/cosmos-sdk/x/auth/signing"
 )
 
+// DefaultGenTxGas default gas for tx simulation
+var DefaultGenTxGas = uint64(1000000)
+
 // SimAppChainID hardcoded chainID for simulation
-const (
-	DefaultGenTxGas = 1000000
-	SimAppChainID   = "simulation-app"
-)
+const SimAppChainID = "simulation-app"
 
 // GenTx generates a signed mock transaction.
 func GenTx(gen client.TxConfig, msgs []sdk.Msg, feeAmt sdk.Coins, gas uint64, chainID string, accNums, accSeqs []uint64, priv ...cryptotypes.PrivKey) (sdk.Tx, error) {