LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages Wiki Activity

Allow getaddednodeinfo result to be string slice.

Browse source 
The getaddednode command dns flag alters the output.  It is a JSON object
when true and a slice of strings containing the addresses when false.
Note there is a bug in bitcoind as of version 0.8.6 which returns the
addresses as a JSON object with duplicate keys.  This has been reported as
issue 3581 on the bitcoind issue tracker.

This commit allows the result for getaddednodeinfo to be either the JSON
object or the string slice.
This commit is contained in:
Dave Collins 2014-01-24 22:37:18 -06:00
parent 421f4c54a0
commit 6e2fa5aad7
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
jsonapi.go
View file

@ -837,7 +837,15 @@ func ReadResultCmd(cmd string, message []byte) (Reply, error) {
// We handle the error condition after the switch statement. // We handle the error condition after the switch statement.
switch cmd { switch cmd {
case "getaddednodeinfo": case "getaddednodeinfo":
var res []GetAddedNodeInfoResult // getaddednodeinfo can either return a JSON object or a
// slice of strings depending on the verbose flag. Choose the
// right form accordingly.
var res interface{}
if strings.Contains(string(objmap["result"]), "{") {
res = []GetAddedNodeInfoResult{}
} else {
res = []string{}
}
err = json.Unmarshal(objmap["result"], &res) err = json.Unmarshal(objmap["result"], &res)
if err == nil { if err == nil {
result.Result = res result.Result = res