Merge branch 'abci_proof' into develop

This commit is contained in:
Jae Kwon
2017-01-27 22:27:32 -08:00
26 changed files with 903 additions and 368 deletions

View File

@ -89,13 +89,13 @@ func (app *localClient) CheckTxAsync(tx []byte) *ReqRes {
)
}
func (app *localClient) QueryAsync(tx []byte) *ReqRes {
func (app *localClient) QueryAsync(reqQuery types.RequestQuery) *ReqRes {
app.mtx.Lock()
res := app.Application.Query(tx)
resQuery := app.Application.Query(reqQuery)
app.mtx.Unlock()
return app.callback(
types.ToRequestQuery(tx),
types.ToResponseQuery(res.Code, res.Data, res.Log),
types.ToRequestQuery(reqQuery),
types.ToResponseQuery(resQuery),
)
}
@ -185,11 +185,11 @@ func (app *localClient) CheckTxSync(tx []byte) (res types.Result) {
return res
}
func (app *localClient) QuerySync(query []byte) (res types.Result) {
func (app *localClient) QuerySync(reqQuery types.RequestQuery) (resQuery types.ResponseQuery, err error) {
app.mtx.Lock()
res = app.Application.Query(query)
resQuery = app.Application.Query(reqQuery)
app.mtx.Unlock()
return res
return resQuery, nil
}
func (app *localClient) CommitSync() (res types.Result) {