poanetwork
/
quorum
mirror of https://github.com/poanetwork/quorum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1673 from karalabe/fix-api-xeth-responses 

rpc: update the xeth over RPC API to use the success/failure messages
This commit is contained in:
Jeffrey Wilcke 2015-08-17 11:47:55 -07:00
parent 2497f28aa9 309788de37
commit 36081505c4
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rpc/xeth.go
View File

@ -53,7 +53,7 @@ func (self *Xeth) Call(method string, params []interface{}) (map[string]interfac
Method: method,
Params: data,
}
// Send the request over and process the response
// Send the request over and retrieve the response
if err := self.client.Send(req); err != nil {
return nil, err
}
@ -61,9 +61,17 @@ func (self *Xeth) Call(method string, params []interface{}) (map[string]interfac
if err != nil {
return nil, err
}
value, ok := res.(map[string]interface{})
if !ok {
return nil, fmt.Errorf("Invalid response type: have %v, want %v", reflect.TypeOf(res), reflect.TypeOf(make(map[string]interface{})))
// Ensure the response is valid, and extract the results
success, isSuccessResponse := res.(*shared.SuccessResponse)
failure, isFailureResponse := res.(*shared.ErrorResponse)
switch {
case isFailureResponse:
return nil, fmt.Errorf("Method invocation failed: %v", failure.Error)
case isSuccessResponse:
return success.Result.(map[string]interface{}), nil
default:
return nil, fmt.Errorf("Invalid response type: %v", reflect.TypeOf(res))
}
return value, nil
}