From 48ccdb09d4c9327499f8c3fd7badfb26bb9b5865 Mon Sep 17 00:00:00 2001 From: Anna Shaleva Date: Thu, 9 Jul 2020 16:53:07 +0300 Subject: [PATCH] rpc: adjust `getversion` RPC-call JSON fields names Part of #1130 --- pkg/rpc/client/rpc_test.go | 2 +- pkg/rpc/response/result/version.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/rpc/client/rpc_test.go b/pkg/rpc/client/rpc_test.go index 02148d259..a9aaf0590 100644 --- a/pkg/rpc/client/rpc_test.go +++ b/pkg/rpc/client/rpc_test.go @@ -602,7 +602,7 @@ var rpcClientTestCases = map[string][]rpcClientTestCase{ invoke: func(c *Client) (interface{}, error) { return c.GetVersion() }, - serverResponse: `{"id":1,"jsonrpc":"2.0","result":{"tcp_port":20332,"ws_port":20342,"nonce":2153672787,"user_agent":"/NEO-GO:0.73.1-pre-273-ge381358/"}}`, + serverResponse: `{"id":1,"jsonrpc":"2.0","result":{"tcpport":20332,"wsport":20342,"nonce":2153672787,"useragent":"/NEO-GO:0.73.1-pre-273-ge381358/"}}`, result: func(c *Client) interface{} { return &result.Version{ TCPPort: uint16(20332), diff --git a/pkg/rpc/response/result/version.go b/pkg/rpc/response/result/version.go index 482d216ce..3572d6685 100644 --- a/pkg/rpc/response/result/version.go +++ b/pkg/rpc/response/result/version.go @@ -4,9 +4,9 @@ type ( // Version model used for reporting server version // info. Version struct { - TCPPort uint16 `json:"tcp_port"` - WSPort uint16 `json:"ws_port,omitempty"` + TCPPort uint16 `json:"tcpport"` + WSPort uint16 `json:"wsport,omitempty"` Nonce uint32 `json:"nonce"` - UserAgent string `json:"user_agent"` + UserAgent string `json:"useragent"` } )