Query returns Code
This commit is contained in:
parent
e110a04ae2
commit
028cc4aa06
|
@ -249,14 +249,14 @@ func (cli *TMSPClient) GetHashSync() (hash []byte, log string, err error) {
|
||||||
return res.Data, res.Log, nil
|
return res.Data, res.Log, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
func (cli *TMSPClient) QuerySync(query []byte) (result []byte, log string, err error) {
|
func (cli *TMSPClient) QuerySync(query []byte) (code types.RetCode, result []byte, log string, err error) {
|
||||||
reqres := cli.queueRequest(types.RequestQuery(query))
|
reqres := cli.queueRequest(types.RequestQuery(query))
|
||||||
cli.FlushSync()
|
cli.FlushSync()
|
||||||
if cli.err != nil {
|
if cli.err != nil {
|
||||||
return nil, "", cli.err
|
return types.RetCodeInternalError, nil, "", cli.err
|
||||||
}
|
}
|
||||||
res := reqres.Response
|
res := reqres.Response
|
||||||
return res.Data, res.Log, nil
|
return types.RetCode(res.Code), res.Data, res.Log, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
//----------------------------------------
|
//----------------------------------------
|
||||||
|
|
|
@ -66,6 +66,6 @@ func (app *CounterApplication) GetHash() (hash []byte, log string) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (app *CounterApplication) Query(query []byte) (result []byte, log string) {
|
func (app *CounterApplication) Query(query []byte) (code types.RetCode, result []byte, log string) {
|
||||||
return nil, fmt.Sprintf("Query is not supported")
|
return types.RetCodeOK, nil, fmt.Sprintf("Query is not supported")
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,6 @@ func (app *DummyApplication) GetHash() (hash []byte, log string) {
|
||||||
return hash, ""
|
return hash, ""
|
||||||
}
|
}
|
||||||
|
|
||||||
func (app *DummyApplication) Query(query []byte) (result []byte, log string) {
|
func (app *DummyApplication) Query(query []byte) (code types.RetCode, result []byte, log string) {
|
||||||
return nil, "Query not supported"
|
return types.RetCodeOK, nil, "Query not supported"
|
||||||
}
|
}
|
||||||
|
|
|
@ -116,8 +116,8 @@ func handleRequest(app types.Application, req *types.Request, responses chan<- *
|
||||||
hash, logStr := app.GetHash()
|
hash, logStr := app.GetHash()
|
||||||
responses <- types.ResponseGetHash(hash, logStr)
|
responses <- types.ResponseGetHash(hash, logStr)
|
||||||
case types.RequestTypeQuery:
|
case types.RequestTypeQuery:
|
||||||
result, logStr := app.Query(req.Data)
|
code, result, logStr := app.Query(req.Data)
|
||||||
responses <- types.ResponseQuery(result, logStr)
|
responses <- types.ResponseQuery(code, result, logStr)
|
||||||
default:
|
default:
|
||||||
responses <- types.ResponseException("Unknown request")
|
responses <- types.ResponseException("Unknown request")
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,5 +18,5 @@ type Application interface {
|
||||||
GetHash() (hash []byte, log string)
|
GetHash() (hash []byte, log string)
|
||||||
|
|
||||||
// Query for state
|
// Query for state
|
||||||
Query(query []byte) (result []byte, log string)
|
Query(query []byte) (code RetCode, result []byte, log string)
|
||||||
}
|
}
|
||||||
|
|
|
@ -125,6 +125,7 @@ func ResponseSetOption(log string) *Response {
|
||||||
func ResponseAppendTx(code RetCode, result []byte, log string) *Response {
|
func ResponseAppendTx(code RetCode, result []byte, log string) *Response {
|
||||||
return &Response{
|
return &Response{
|
||||||
Type: ResponseTypeAppendTx,
|
Type: ResponseTypeAppendTx,
|
||||||
|
Code: uint32(code),
|
||||||
Data: result,
|
Data: result,
|
||||||
Log: log,
|
Log: log,
|
||||||
}
|
}
|
||||||
|
@ -133,6 +134,7 @@ func ResponseAppendTx(code RetCode, result []byte, log string) *Response {
|
||||||
func ResponseCheckTx(code RetCode, result []byte, log string) *Response {
|
func ResponseCheckTx(code RetCode, result []byte, log string) *Response {
|
||||||
return &Response{
|
return &Response{
|
||||||
Type: ResponseTypeCheckTx,
|
Type: ResponseTypeCheckTx,
|
||||||
|
Code: uint32(code),
|
||||||
Data: result,
|
Data: result,
|
||||||
Log: log,
|
Log: log,
|
||||||
}
|
}
|
||||||
|
@ -146,9 +148,10 @@ func ResponseGetHash(hash []byte, log string) *Response {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func ResponseQuery(result []byte, log string) *Response {
|
func ResponseQuery(code RetCode, result []byte, log string) *Response {
|
||||||
return &Response{
|
return &Response{
|
||||||
Type: ResponseTypeQuery,
|
Type: ResponseTypeQuery,
|
||||||
|
Code: uint32(code),
|
||||||
Data: result,
|
Data: result,
|
||||||
Log: log,
|
Log: log,
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue