fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-04-25 14:52:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1902 from tendermint/1766-wrong-field-access

Browse Source 
fix wrong field access in LoadConsensusParams
This commit is contained in:
Alexander Simmerl 2018-07-04 15:17:10 +02:00 committed by GitHub
commit 99e982669e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
state/store.go
View File

@ -4,9 +4,9 @@ import (
"fmt" "fmt"
abci "github.com/tendermint/tendermint/abci/types" abci "github.com/tendermint/tendermint/abci/types"
"github.com/tendermint/tendermint/types"
cmn "github.com/tendermint/tendermint/libs/common" cmn "github.com/tendermint/tendermint/libs/common"
dbm "github.com/tendermint/tendermint/libs/db" dbm "github.com/tendermint/tendermint/libs/db"
"github.com/tendermint/tendermint/types"
) )
//------------------------------------------------------------------------ //------------------------------------------------------------------------
@ -175,8 +175,13 @@ func LoadValidators(db dbm.DB, height int64) (*types.ValidatorSet, error) {
if valInfo.ValidatorSet == nil { if valInfo.ValidatorSet == nil {
valInfo2 := loadValidatorsInfo(db, valInfo.LastHeightChanged) valInfo2 := loadValidatorsInfo(db, valInfo.LastHeightChanged)
if valInfo2 == nil { if valInfo2 == nil {
cmn.PanicSanity(fmt.Sprintf(`Couldn't find validators at height %d as panic(
last changed from height %d`, valInfo.LastHeightChanged, height)) fmt.Sprintf(
"Couldn't find validators at height %d as last changed from height %d",
valInfo.LastHeightChanged,
height,
),
)
} }
valInfo = valInfo2 valInfo = valInfo2
} }
@ -239,11 +244,17 @@ func LoadConsensusParams(db dbm.DB, height int64) (types.ConsensusParams, error)
} }
if paramsInfo.ConsensusParams == empty { if paramsInfo.ConsensusParams == empty {
paramsInfo = loadConsensusParamsInfo(db, paramsInfo.LastHeightChanged) paramsInfo2 := loadConsensusParamsInfo(db, paramsInfo.LastHeightChanged)
if paramsInfo == nil { if paramsInfo2 == nil {
cmn.PanicSanity(fmt.Sprintf(`Couldn't find consensus params at height %d as panic(
last changed from height %d`, paramsInfo.LastHeightChanged, height)) fmt.Sprintf(
"Couldn't find consensus params at height %d as last changed from height %d",
paramsInfo.LastHeightChanged,
height,
),
)
} }
paramsInfo = paramsInfo2
} }
return paramsInfo.ConsensusParams, nil return paramsInfo.ConsensusParams, nil