From 6b939fbeaa7db139e06223926d6b4355ae0e71ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Thu, 4 Feb 2016 12:44:34 +0200 Subject: rpc: add jsonrpc version to module request, use json types --- rpc/utils.go | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'rpc') diff --git a/rpc/utils.go b/rpc/utils.go index 25321c543..39acf8196 100644 --- a/rpc/utils.go +++ b/rpc/utils.go @@ -218,29 +218,27 @@ func newSubscriptionId() (string, error) { // SupportedModules returns the collection of API's that the RPC server offers // on which the given client connects. func SupportedModules(client Client) (map[string]string, error) { - req := map[string]interface{}{ - "id": 1, - "method": "rpc_modules", + req := JSONRequest{ + Id: new(int64), + Version: "2.0", + Method: "rpc_modules", } - if err := client.Send(req); err != nil { return nil, err } - var response map[string]interface{} + var response JSONSuccessResponse if err := client.Recv(&response); err != nil { return nil, err } - - if payload, ok := response["result"]; ok { + if response.Result != nil { mods := make(map[string]string) - if modules, ok := payload.(map[string]interface{}); ok { + if modules, ok := response.Result.(map[string]interface{}); ok { for m, v := range modules { mods[m] = fmt.Sprintf("%s", v) } return mods, nil } } - return nil, fmt.Errorf("unable to retrieve modules") } -- cgit v1.2.3