From 1fee394e0803f15ffb81b84512c5bf92bca67348 Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Thu, 18 May 2017 07:44:49 -0500
Subject: [PATCH] btcjson: Update GetNetworkInfoResult.
This updates the GetNetworkInfoResult structure to include the latest
fields added to Core for compatibility purposes.
While here, also move the definitions of the subtypes for the result
before their use for consistency.
---
btcjson/chainsvrresults.go | 39 ++++++++++++++++++++++----------------
1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/btcjson/chainsvrresults.go b/btcjson/chainsvrresults.go
index 2f368abc3..960ffcf75 100644
--- a/btcjson/chainsvrresults.go
+++ b/btcjson/chainsvrresults.go
@@ -192,16 +192,39 @@ type GetMempoolInfoResult struct {
Bytes int64 `json:"bytes"`
}
+// NetworksResult models the networks data from the getnetworkinfo command.
+type NetworksResult struct {
+ Name string `json:"name"`
+ Limited bool `json:"limited"`
+ Reachable bool `json:"reachable"`
+ Proxy string `json:"proxy"`
+ ProxyRandomizeCredentials bool `json:"proxy_randomize_credentials"`
+}
+
+// LocalAddressesResult models the localaddresses data from the getnetworkinfo
+// command.
+type LocalAddressesResult struct {
+ Address string `json:"address"`
+ Port uint16 `json:"port"`
+ Score int32 `json:"score"`
+}
+
// GetNetworkInfoResult models the data returned from the getnetworkinfo
// command.
type GetNetworkInfoResult struct {
Version int32 `json:"version"`
+ SubVersion string `json:"subversion"`
ProtocolVersion int32 `json:"protocolversion"`
+ LocalServices string `json:"localservices"`
+ LocalRelay bool `json:"localrelay"`
TimeOffset int64 `json:"timeoffset"`
Connections int32 `json:"connections"`
+ NetworkActive bool `json:"networkactive"`
Networks []NetworksResult `json:"networks"`
RelayFee float64 `json:"relayfee"`
+ IncrementalFee float64 `json:"incrementalfee"`
LocalAddresses []LocalAddressesResult `json:"localaddresses"`
+ Warnings string `json:"warnings"`
}
// GetPeerInfoResult models the data returned from the getpeerinfo command.
@@ -415,22 +438,6 @@ type InfoChainResult struct {
Errors string `json:"errors"`
}
-// LocalAddressesResult models the localaddresses data from the getnetworkinfo
-// command.
-type LocalAddressesResult struct {
- Address string `json:"address"`
- Port uint16 `json:"port"`
- Score int32 `json:"score"`
-}
-
-// NetworksResult models the networks data from the getnetworkinfo command.
-type NetworksResult struct {
- Name string `json:"name"`
- Limited bool `json:"limited"`
- Reachable bool `json:"reachable"`
- Proxy string `json:"proxy"`
-}
-
// TxRawResult models the data from the getrawtransaction command.
type TxRawResult struct {
Hex string `json:"hex"`