status-im
/
go-waku
mirror of https://github.com/status-im/go-waku.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: separate error and success responses as per the specification (#323)

This commit is contained in:
Daniel Sanchez 2022-09-30 17:32:54 +02:00 committed by GitHub
parent 1e09904523
commit 0da70116b0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
library/response.go
View File

@ -5,8 +5,11 @@ import (
"encoding/json" "encoding/json"
) )
type jsonResponse struct { type jsonResponseError struct {
Error *string `json:"error,omitempty"` Error *string `json:"error"`
}
type jsonResponseSuccess struct {
Result interface{} `json:"result"` Result interface{} `json:"result"`
} }
@ -14,14 +17,14 @@ func prepareJSONResponse(result interface{}, err error) *C.char {
if err != nil { if err != nil {
errStr := err.Error() errStr := err.Error()
errResponse := jsonResponse{ errResponse := jsonResponseError{
Error: &errStr, Error: &errStr,
} }
response, _ := json.Marshal(&errResponse) response, _ := json.Marshal(&errResponse)
return C.CString(string(response)) return C.CString(string(response))
} }
data, err := json.Marshal(jsonResponse{Result: result}) data, err := json.Marshal(jsonResponseSuccess{Result: result})
if err != nil { if err != nil {
return prepareJSONResponse(nil, err) return prepareJSONResponse(nil, err)
} }
@ -35,7 +38,7 @@ func makeJSONResponse(err error) *C.char {
errString = &errStr errString = &errStr
} }
out := jsonResponse{ out := jsonResponseError{
Error: errString, Error: errString,
} }
outBytes, _ := json.Marshal(out) outBytes, _ := json.Marshal(out)