LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge PR #4001: Upgrade Tendermint to v0.31.1

Browse Source
This commit is contained in:
Alexander Bezobchuk
2019-03-29 13:13:45 -04:00
committed by GitHub
parent 9556393aaf
commit 92f653b35c
7 changed files with 44 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
baseapp/baseapp.go
+2 -2
View File
@@ -291,11 +291,11 @@ func (app *BaseApp) storeConsensusParams(consensusParams *abci.ConsensusParams)
// if maximum block gas is less than negative one and returns zero if negative
// one.
func (app *BaseApp) getMaximumBlockGas() uint64 {
if app.consensusParams == nil || app.consensusParams.BlockSize == nil {
if app.consensusParams == nil || app.consensusParams.Block == nil {
return 0
}
maxGas := app.consensusParams.BlockSize.MaxGas
maxGas := app.consensusParams.Block.MaxGas
switch {
case maxGas < -1:
panic(fmt.Sprintf("invalid maximum block gas: %d", maxGas))
baseapp/baseapp_test.go
+6 -6
View File
@@ -946,7 +946,7 @@ func TestMaxBlockGasLimits(t *testing.T) {
app := setupBaseApp(t, anteOpt, routerOpt)
app.InitChain(abci.RequestInitChain{
ConsensusParams: &abci.ConsensusParams{
BlockSize: &abci.BlockSizeParams{
Block: &abci.BlockParams{
MaxGas: 100,
},
},
@@ -1122,7 +1122,7 @@ func TestGasConsumptionBadTx(t *testing.T) {
app := setupBaseApp(t, anteOpt, routerOpt)
app.InitChain(abci.RequestInitChain{
ConsensusParams: &abci.ConsensusParams{
BlockSize: &abci.BlockSizeParams{
Block: &abci.BlockParams{
MaxGas: 9,
},
},
@@ -1241,15 +1241,15 @@ func TestP2PQuery(t *testing.T) {
func TestGetMaximumBlockGas(t *testing.T) {
app := setupBaseApp(t)
app.setConsensusParams(&abci.ConsensusParams{BlockSize: &abci.BlockSizeParams{MaxGas: 0}})
app.setConsensusParams(&abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: 0}})
require.Equal(t, uint64(0), app.getMaximumBlockGas())
app.setConsensusParams(&abci.ConsensusParams{BlockSize: &abci.BlockSizeParams{MaxGas: -1}})
app.setConsensusParams(&abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: -1}})
require.Equal(t, uint64(0), app.getMaximumBlockGas())
app.setConsensusParams(&abci.ConsensusParams{BlockSize: &abci.BlockSizeParams{MaxGas: 5000000}})
app.setConsensusParams(&abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: 5000000}})
require.Equal(t, uint64(5000000), app.getMaximumBlockGas())
app.setConsensusParams(&abci.ConsensusParams{BlockSize: &abci.BlockSizeParams{MaxGas: -5000000}})
app.setConsensusParams(&abci.ConsensusParams{Block: &abci.BlockParams{MaxGas: -5000000}})
require.Panics(t, func() { app.getMaximumBlockGas() })
}