Group (code,data,log) return values into types.Result
This commit is contained in:
parent
9b4b533f2f
commit
de6f76758d
|
@ -9,7 +9,6 @@ import (
|
||||||
"github.com/tendermint/tendermint/proxy"
|
"github.com/tendermint/tendermint/proxy"
|
||||||
"github.com/tendermint/tendermint/types"
|
"github.com/tendermint/tendermint/types"
|
||||||
"github.com/tendermint/tmsp/example/counter"
|
"github.com/tendermint/tmsp/example/counter"
|
||||||
tmsp "github.com/tendermint/tmsp/types"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
@ -70,10 +69,10 @@ func TestSerialReap(t *testing.T) {
|
||||||
for i := start; i < end; i++ {
|
for i := start; i < end; i++ {
|
||||||
txBytes := make([]byte, 8)
|
txBytes := make([]byte, 8)
|
||||||
binary.BigEndian.PutUint64(txBytes, uint64(i))
|
binary.BigEndian.PutUint64(txBytes, uint64(i))
|
||||||
code, result, logStr := appConnCon.AppendTx(txBytes)
|
res := appConnCon.AppendTx(txBytes)
|
||||||
if code != tmsp.CodeType_OK {
|
if !res.IsOK() {
|
||||||
t.Errorf("Error committing tx. Code:%v result:%X log:%v",
|
t.Errorf("Error committing tx. Code:%v result:%X log:%v",
|
||||||
code, result, logStr)
|
res.Code, res.Data, res.Log)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
hash, log := appConnCon.Commit()
|
hash, log := appConnCon.Commit()
|
||||||
|
|
|
@ -54,21 +54,21 @@ func (app *localAppConn) SetOptionAsync(key string, value string) *tmspcli.ReqRe
|
||||||
|
|
||||||
func (app *localAppConn) AppendTxAsync(tx []byte) *tmspcli.ReqRes {
|
func (app *localAppConn) AppendTxAsync(tx []byte) *tmspcli.ReqRes {
|
||||||
app.mtx.Lock()
|
app.mtx.Lock()
|
||||||
code, result, log := app.Application.AppendTx(tx)
|
res := app.Application.AppendTx(tx)
|
||||||
app.mtx.Unlock()
|
app.mtx.Unlock()
|
||||||
return app.callback(
|
return app.callback(
|
||||||
tmsp.RequestAppendTx(tx),
|
tmsp.RequestAppendTx(tx),
|
||||||
tmsp.ResponseAppendTx(code, result, log),
|
tmsp.ResponseAppendTx(res.Code, res.Data, res.Log),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
func (app *localAppConn) CheckTxAsync(tx []byte) *tmspcli.ReqRes {
|
func (app *localAppConn) CheckTxAsync(tx []byte) *tmspcli.ReqRes {
|
||||||
app.mtx.Lock()
|
app.mtx.Lock()
|
||||||
code, result, log := app.Application.CheckTx(tx)
|
res := app.Application.CheckTx(tx)
|
||||||
app.mtx.Unlock()
|
app.mtx.Unlock()
|
||||||
return app.callback(
|
return app.callback(
|
||||||
tmsp.RequestCheckTx(tx),
|
tmsp.RequestCheckTx(tx),
|
||||||
tmsp.ResponseCheckTx(code, result, log),
|
tmsp.ResponseCheckTx(res.Code, res.Data, res.Log),
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue