Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Simplify rpc result parsing logic #39

Merged
merged 1 commit into from
Feb 10, 2023
Merged

Simplify rpc result parsing logic #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 7 additions & 14 deletions admin/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ func NewClient(account *nkn.Account, clientConfig *nkn.ClientConfig) (*Client, e
return c, nil
}

func (c *Client) RPCCall(addr, method string, params map[string]interface{}, result interface{}) error {
func (c *Client) RPCCall(addr, method string, params interface{}, result interface{}) error {
req, err := json.Marshal(map[string]interface{}{
"id": "nConnect",
"method": method,
Expand All @@ -64,23 +64,16 @@ func (c *Client) RPCCall(addr, method string, params map[string]interface{}, res
return errReplyTimeout
}

resp := make(map[string]*json.RawMessage)
err = json.Unmarshal(reply.Data, &resp)
resp := &rpcResp{
Result: result,
}
err = json.Unmarshal(reply.Data, resp)
if err != nil {
return err
}
if resp["error"] != nil {
var errStr string
err = json.Unmarshal(*resp["error"], &errStr)
if err != nil {
return err
}
return errors.New(errStr)
}

err = json.Unmarshal(*resp["result"], result)
if err != nil {
return err
if len(resp.Error) > 0 {
return errors.New(resp.Error)
}

return nil
Expand Down