certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix merge conflict bug; Update PENDING

This commit is contained in:
Jae Kwon 2018-11-04 19:42:11 -08:00
parent 5b74e1d0b6
commit f4338d6f75
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PENDING.md
View File

@ -12,7 +12,7 @@ BREAKING CHANGES
* [simulation] \#2665 only argument to simulation.Invariant is now app * [simulation] \#2665 only argument to simulation.Invariant is now app
* Tendermint * Tendermint
* Upgrade to version 0.26.0
FEATURES FEATURES

2
store/iavlstore.go
View File

@ -220,7 +220,7 @@ func (st *iavlStore) Query(req abci.RequestQuery) (res abci.ResponseQuery) {
} }
if req.Prove { if req.Prove {
value, _, err := tree.GetVersionedWithProof(key, res.Height) value, proof, err := tree.GetVersionedWithProof(key, res.Height)
if err != nil { if err != nil {
res.Log = err.Error() res.Log = err.Error()
break break