diff --git a/cmdhelp.go b/cmdhelp.go
index d65adc92..3b745e77 100644
--- a/cmdhelp.go
+++ b/cmdhelp.go
@@ -770,5 +770,5 @@ func GetHelpString(cmdName string) (string, error) {
if c, ok := customCmds[cmdName]; ok {
return c.helpString, nil
}
- return helpstr, errors.New("Invalid command specified")
+ return helpstr, errors.New("invalid command specified")
}
diff --git a/jsonapi.go b/jsonapi.go
index ba678d23..47fb11af 100644
--- a/jsonapi.go
+++ b/jsonapi.go
@@ -94,20 +94,20 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
"stop", "walletlock", "getbestblockhash", "getblockchaininfo",
"getnetworkinfo":
if len(args) > 0 {
- err = fmt.Errorf("Too many arguments for %s", message)
+ err = fmt.Errorf("too many arguments for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One optional int
case "listaccounts":
if len(args) > 1 {
- err = fmt.Errorf("Too many arguments for %s", message)
+ err = fmt.Errorf("too many arguments for %s", message)
return finalMessage, err
}
if len(args) == 1 {
_, ok := args[0].(int)
if !ok {
- err = fmt.Errorf("Argument must be int for %s", message)
+ err = fmt.Errorf("argument must be int for %s", message)
return finalMessage, err
}
}
@@ -115,24 +115,24 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
// One required int
case "getblockhash", "estimatefee", "estimatepriority":
if len(args) != 1 {
- err = fmt.Errorf("Missing argument for %s", message)
+ err = fmt.Errorf("missing argument for %s", message)
return finalMessage, err
}
_, ok := args[0].(int)
if !ok {
- err = fmt.Errorf("Argument must be int for %s", message)
+ err = fmt.Errorf("argument must be int for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One required float
case "settxfee":
if len(args) != 1 {
- err = fmt.Errorf("Missing argument for %s", message)
+ err = fmt.Errorf("missing argument for %s", message)
return finalMessage, err
}
_, ok := args[0].(float64)
if !ok {
- err = fmt.Errorf("Argument must be float64 for %s", message)
+ err = fmt.Errorf("argument must be float64 for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
@@ -140,13 +140,13 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
case "getmemorypool", "getnewaddress", "getwork", "help",
"getrawchangeaddress":
if len(args) > 1 {
- err = fmt.Errorf("Too many arguments for %s", message)
+ err = fmt.Errorf("too many arguments for %s", message)
return finalMessage, err
}
if len(args) == 1 {
_, ok := args[0].(string)
if !ok {
- err = fmt.Errorf("Optional argument must be string for %s", message)
+ err = fmt.Errorf("optional argument must be string for %s", message)
return finalMessage, err
}
}
@@ -162,54 +162,54 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
}
_, ok := args[0].(string)
if !ok {
- err = fmt.Errorf("Argument must be string for %s", message)
+ err = fmt.Errorf("argument must be string for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// Two required strings
case "setaccount", "signmessage", "walletpassphrasechange", "addnode":
if len(args) != 2 {
- err = fmt.Errorf("Missing arguments for %s", message)
+ err = fmt.Errorf("missing arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
_, ok2 := args[1].(string)
if !ok1 || !ok2 {
- err = fmt.Errorf("Arguments must be string for %s", message)
+ err = fmt.Errorf("arguments must be string for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One required string, one required int
case "walletpassphrase":
if len(args) != 2 {
- err = fmt.Errorf("Missing arguments for %s", message)
+ err = fmt.Errorf("missing arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
_, ok2 := args[1].(int)
if !ok1 || !ok2 {
- err = fmt.Errorf("Arguments must be string and int for %s", message)
+ err = fmt.Errorf("arguments must be string and int for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// Three required strings
case "verifymessage":
if len(args) != 3 {
- err = fmt.Errorf("Three arguments required for %s", message)
+ err = fmt.Errorf("three arguments required for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
_, ok2 := args[1].(string)
_, ok3 := args[2].(string)
if !ok1 || !ok2 || !ok3 {
- err = fmt.Errorf("Arguments must be string for %s", message)
+ err = fmt.Errorf("arguments must be string for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One required bool, one optional string
case "getaddednodeinfo":
if len(args) > 2 || len(args) == 0 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(bool)
@@ -218,14 +218,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(string)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Arguments must be bool and optionally string for %s", message)
+ err = fmt.Errorf("arguments must be bool and optionally string for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One required bool, one optional int
case "setgenerate":
if len(args) > 2 || len(args) == 0 {
- err = fmt.Errorf("Wrong number of argument for %s", message)
+ err = fmt.Errorf("wrong number of argument for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(bool)
@@ -234,14 +234,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(int)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Arguments must be bool and optionally int for %s", message)
+ err = fmt.Errorf("arguments must be bool and optionally int for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One optional string, one optional int
case "getbalance", "getreceivedbyaccount":
if len(args) > 2 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
ok1 := true
@@ -253,14 +253,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(int)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Optional arguments must be string and int for %s", message)
+ err = fmt.Errorf("optional arguments must be string and int for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One required string, one optional int
case "getrawtransaction", "getreceivedbyaddress":
if len(args) > 2 || len(args) == 0 {
- err = fmt.Errorf("Wrong number of argument for %s", message)
+ err = fmt.Errorf("wrong number of argument for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
@@ -269,7 +269,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(int)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Arguments must be string and optionally int for %s", message)
+ err = fmt.Errorf("arguments must be string and optionally int for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
@@ -279,7 +279,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
// support for it is complete.
case "submitblock":
if len(args) > 2 || len(args) == 0 {
- err = fmt.Errorf("Wrong number of argument for %s", message)
+ err = fmt.Errorf("wrong number of argument for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
@@ -288,14 +288,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(string)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Arguments must be string and optionally string for %s", message)
+ err = fmt.Errorf("arguments must be string and optionally string for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One optional int, one optional bool
case "listreceivedbyaccount", "listreceivedbyaddress":
if len(args) > 2 {
- err = fmt.Errorf("Wrong number of argument for %s", message)
+ err = fmt.Errorf("wrong number of argument for %s", message)
return finalMessage, err
}
ok1 := true
@@ -307,14 +307,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(bool)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Optional arguments must be int and bool for %s", message)
+ err = fmt.Errorf("optional arguments must be int and bool for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One optional string, two optional ints
case "listtransactions":
if len(args) > 3 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
ok1 := true
@@ -330,14 +330,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok3 = args[2].(int)
}
if !ok1 || !ok2 || !ok3 {
- err = fmt.Errorf("Optional arguments must be string and up to two ints for %s", message)
+ err = fmt.Errorf("optional arguments must be string and up to two ints for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One required string, one optional string, one optional bool
case "importprivkey":
if len(args) > 3 || len(args) == 0 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
@@ -350,14 +350,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok3 = args[2].(bool)
}
if !ok1 || !ok2 || !ok3 {
- err = fmt.Errorf("Arguments must be string and optionally string and bool for %s", message)
+ err = fmt.Errorf("arguments must be string and optionally string and bool for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// Two optional ints
case "listunspent":
if len(args) > 2 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
ok1 := true
@@ -369,14 +369,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(int)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Optional arguments must be ints for %s", message)
+ err = fmt.Errorf("optional arguments must be ints for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// Two optional strings
case "listsinceblock":
if len(args) > 2 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
ok1 := true
@@ -388,7 +388,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok2 = args[1].(string)
}
if !ok1 || !ok2 {
- err = fmt.Errorf("Optional arguments must be strings for %s", message)
+ err = fmt.Errorf("optional arguments must be strings for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
@@ -397,7 +397,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
// two optional strings.
case "sendfrom":
if len(args) > 6 || len(args) < 3 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
@@ -416,7 +416,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok6 = args[5].(string)
}
if !ok1 || !ok2 || !ok3 || !ok4 || !ok5 || !ok6 {
- err = fmt.Errorf("Arguments must be string, string, float64 and optionally int and two strings for %s", message)
+ err = fmt.Errorf("arguments must be string, string, float64 and optionally int and two strings for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
@@ -424,7 +424,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
// one optional string.
case "move":
if len(args) > 5 || len(args) < 3 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
@@ -439,14 +439,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok5 = args[4].(string)
}
if !ok1 || !ok2 || !ok3 || !ok4 || !ok5 {
- err = fmt.Errorf("Arguments must be string, string, float64 and optionally int and string for %s", message)
+ err = fmt.Errorf("arguments must be string, string, float64 and optionally int and string for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// One required strings, one required float, two optional strings
case "sendtoaddress":
if len(args) > 4 || len(args) < 2 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
@@ -460,14 +460,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok4 = args[3].(string)
}
if !ok1 || !ok2 || !ok3 || !ok4 {
- err = fmt.Errorf("Arguments must be string, float64 and optionally two strings for %s", message)
+ err = fmt.Errorf("arguments must be string, float64 and optionally two strings for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// required int, required pair of keys (string), optional string
case "addmultisignaddress":
if len(args) > 4 || len(args) < 3 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(int)
@@ -478,14 +478,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
_, ok4 = args[2].(string)
}
if !ok1 || !ok2 || !ok3 || !ok4 {
- err = fmt.Errorf("Arguments must be int, two string and optionally one for %s", message)
+ err = fmt.Errorf("arguments must be int, two string and optionally one for %s", message)
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
// Must be a set of string, int, string, float (any number of those).
case "createrawtransaction":
if len(args)%4 != 0 || len(args) == 0 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
type vlist struct {
@@ -494,13 +494,13 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
}
vList := make([]vlist, len(args)/4)
addresses := make(map[string]float64)
- for i := 0; i < len(args)/4; i += 1 {
+ for i := 0; i < len(args)/4; i++ {
txid, ok1 := args[(i*4)+0].(string)
vout, ok2 := args[(i*4)+1].(uint32)
add, ok3 := args[(i*4)+2].(string)
amt, ok4 := args[(i*4)+3].(float64)
if !ok1 || !ok2 || !ok3 || !ok4 {
- err = fmt.Errorf("Incorrect arguement types.")
+ err = fmt.Errorf("incorrect arguement types")
return finalMessage, err
}
vList[i].Txid = txid
@@ -511,14 +511,14 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
// string, string/float pairs, optional int, and string
case "sendmany":
if len(args) < 3 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
var minconf int
var comment string
_, ok1 := args[0].(string)
if !ok1 {
- err = fmt.Errorf("Incorrect arguement types.")
+ err = fmt.Errorf("incorrect arguement types")
return finalMessage, err
}
addresses := make(map[string]float64)
@@ -528,7 +528,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
if len(args) > i+1 {
amt, ok2 := args[i+1].(float64)
if !ok2 {
- err = fmt.Errorf("Incorrect arguement types.")
+ err = fmt.Errorf("incorrect arguement types")
return finalMessage, err
}
// Put a single pair into addresses
@@ -551,12 +551,12 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
// bool and an array of stuff
case "lockunspent":
if len(args) < 2 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(bool)
if !ok1 {
- err = fmt.Errorf("Incorrect arguement types.")
+ err = fmt.Errorf("incorrect arguement types")
return finalMessage, err
}
finalMessage, err = jsonWithArgs(message, id, args)
@@ -564,12 +564,12 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
// and one string along with another optional string.
case "signrawtransaction":
if len(args) < 1 {
- err = fmt.Errorf("Wrong number of arguments for %s", message)
+ err = fmt.Errorf("wrong number of arguments for %s", message)
return finalMessage, err
}
_, ok1 := args[0].(string)
if !ok1 {
- err = fmt.Errorf("Incorrect arguement types.")
+ err = fmt.Errorf("incorrect arguement types")
return finalMessage, err
}
type txlist struct {
@@ -584,7 +584,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
vout, ok3 := args[2].(uint32)
spkey, ok4 := args[3].(string)
if !ok1 || !ok2 || !ok3 || !ok4 {
- err = fmt.Errorf("Incorrect arguement types.")
+ err = fmt.Errorf("incorrect arguement types")
return finalMessage, err
}
txList[0].Txid = txid
@@ -612,7 +612,7 @@ func CreateMessageWithId(message string, id interface{}, args ...interface{}) ([
finalMessage, err = jsonWithArgs(message, id, []interface{}{args[0].(string), txList})
// Any other message
default:
- err = fmt.Errorf("Not a valid command: %s", message)
+ err = fmt.Errorf("not a valid command: %s", message)
}
return finalMessage, err
}
@@ -626,7 +626,7 @@ func JSONGetMethod(message []byte) (string, error) {
var msg interface{}
err := json.Unmarshal(message, &msg)
if err != nil {
- err := fmt.Errorf("Error, message does not appear to be valid json: %v", err)
+ err := fmt.Errorf("error, message does not appear to be valid json: %v", err)
return method, err
}
m := msg.(map[string]interface{})
@@ -636,7 +636,7 @@ func JSONGetMethod(message []byte) (string, error) {
}
}
if method == "" {
- err := fmt.Errorf("Error, no method specified.")
+ err := fmt.Errorf("error, no method specified")
return method, err
}
return method, err
@@ -669,12 +669,12 @@ func rpcCommand(user string, password string, server string, message []byte,
body, err := rpcRawCommand(user, password, server, message, https,
certificates, skipverify)
if err != nil {
- err := fmt.Errorf("Error getting json reply: %v", err)
+ err := fmt.Errorf("error getting json reply: %v", err)
return result, err
}
result, err = ReadResultCmd(method, body)
if err != nil {
- err := fmt.Errorf("Error reading json message: %v", err)
+ err := fmt.Errorf("error reading json message: %v", err)
return result, err
}
return result, err
@@ -704,18 +704,18 @@ func rpcRawCommand(user string, password string, server string,
var msg interface{}
err := json.Unmarshal(message, &msg)
if err != nil {
- err := fmt.Errorf("Error, message does not appear to be valid json: %v", err)
+ err := fmt.Errorf("error, message does not appear to be valid json: %v", err)
return result, err
}
resp, err := jsonRpcSend(user, password, server, message, https,
certificates, skipverify)
if err != nil {
- err := fmt.Errorf("Error sending json message: " + err.Error())
+ err := fmt.Errorf("error sending json message: " + err.Error())
return result, err
}
result, err = GetRaw(resp.Body)
if err != nil {
- err := fmt.Errorf("Error getting json reply: %v", err)
+ err := fmt.Errorf("error getting json reply: %v", err)
return result, err
}
return result, err
@@ -779,11 +779,11 @@ func JSONToAmount(jsonAmount float64) (int64, error) {
var amount int64
var err error
if jsonAmount > 1.797693134862315708145274237317043567981e+300 {
- err := fmt.Errorf("Error %v is too large to convert", jsonAmount)
+ err := fmt.Errorf("error %v is too large to convert", jsonAmount)
return amount, err
}
if jsonAmount < -1.797693134862315708145274237317043567981e+300 {
- err := fmt.Errorf("Error %v is too small to convert", jsonAmount)
+ err := fmt.Errorf("error %v is too small to convert", jsonAmount)
return amount, err
}
tempVal := 1e8 * jsonAmount
diff --git a/jsonapi_test.go b/jsonapi_test.go
index 4c1459f3..19aff307 100644
--- a/jsonapi_test.go
+++ b/jsonapi_test.go
@@ -279,7 +279,7 @@ func TestRpcReply(t *testing.T) {
}
var idtests = []struct {
- testId []interface{}
+ testID []interface{}
pass bool
}{
{[]interface{}{"string test"}, true},
@@ -293,7 +293,7 @@ var idtests = []struct {
// types).
func TestIsValidIdType(t *testing.T) {
for _, tt := range idtests {
- res := btcjson.IsValidIdType(tt.testId[0])
+ res := btcjson.IsValidIdType(tt.testID[0])
if res != tt.pass {
t.Errorf("Incorrect type result %v.", tt)
}
diff --git a/jsoncmd.go b/jsoncmd.go
index 2eae4841..2b9bae58 100644
--- a/jsoncmd.go
+++ b/jsoncmd.go
@@ -533,7 +533,7 @@ func NewAddNodeCmd(id interface{}, addr string, subcmd string) (
case "onetry":
// fine
default:
- return nil, errors.New("Invalid subcommand for addnode")
+ return nil, errors.New("invalid subcommand for addnode")
}
return &AddNodeCmd{
@@ -1714,7 +1714,7 @@ var _ Cmd = &GetBalanceCmd{}
// and an int for minconf may be provided as arguments.
func NewGetBalanceCmd(id interface{}, optArgs ...interface{}) (*GetBalanceCmd, error) {
var account string
- var minconf int = 1
+ var minconf = 1
if len(optArgs) > 2 {
return nil, ErrWrongNumberOfParams
@@ -1991,7 +1991,7 @@ type GetBlockChainInfoCmd struct {
// Enforce that GetBlockChainInfoCmd satisifies the Cmd interface.
var _ Cmd = &GetBlockChainInfoCmd{}
-// NewBlockChainInfoCmd creates a new GetBlockChainInfoCmd.
+// NewGetBlockChainInfoCmd creates a new GetBlockChainInfoCmd.
func NewGetBlockChainInfoCmd(id interface{}) (*GetBlockChainInfoCmd, error) {
return &GetBlockChainInfoCmd{
id: id,
@@ -2669,7 +2669,7 @@ type GetNetworkInfoCmd struct {
// Enforce that GetNetworkInfoCmd satisifies the Cmd interface.
var _ Cmd = &GetNetworkInfoCmd{}
-// NewNetworkInfoCmd creates a new GetNetworkInfoCmd.
+// NewGetNetworkInfoCmd creates a new GetNetworkInfoCmd.
func NewGetNetworkInfoCmd(id interface{}) (*GetNetworkInfoCmd, error) {
return &GetNetworkInfoCmd{
id: id,
@@ -3285,7 +3285,7 @@ func NewGetReceivedByAccountCmd(id interface{}, account string, optArgs ...int)
if len(optArgs) > 1 {
return nil, ErrTooManyOptArgs
}
- var minconf int = 1
+ var minconf = 1
if len(optArgs) > 0 {
minconf = optArgs[0]
}
@@ -3374,7 +3374,7 @@ func NewGetReceivedByAddressCmd(id interface{}, address string, optArgs ...int)
if len(optArgs) > 1 {
return nil, ErrTooManyOptArgs
}
- var minconf int = 1
+ var minconf = 1
if len(optArgs) > 0 {
minconf = optArgs[0]
}
diff --git a/jsoncmd_test.go b/jsoncmd_test.go
index 30910adb..b5db010e 100644
--- a/jsoncmd_test.go
+++ b/jsoncmd_test.go
@@ -14,7 +14,7 @@ import (
"github.com/davecgh/go-spew/spew"
)
-var testId = float64(1)
+var testID = float64(1)
var jsoncmdtests = []struct {
name string
@@ -26,11 +26,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "addmultisigaddress",
f: func() (Cmd, error) {
- return NewAddMultisigAddressCmd(testId, 1,
+ return NewAddMultisigAddressCmd(testID, 1,
[]string{"foo", "bar"})
},
result: &AddMultisigAddressCmd{
- id: testId,
+ id: testID,
NRequired: 1,
Keys: []string{"foo", "bar"},
Account: "",
@@ -40,11 +40,11 @@ var jsoncmdtests = []struct {
name: "+ optional",
cmd: "addmultisigaddress",
f: func() (Cmd, error) {
- return NewAddMultisigAddressCmd(testId, 1,
+ return NewAddMultisigAddressCmd(testID, 1,
[]string{"foo", "bar"}, "address")
},
result: &AddMultisigAddressCmd{
- id: testId,
+ id: testID,
NRequired: 1,
Keys: []string{"foo", "bar"},
Account: "address",
@@ -55,11 +55,11 @@ var jsoncmdtests = []struct {
name: "basic add",
cmd: "addnode",
f: func() (Cmd, error) {
- return NewAddNodeCmd(testId, "address",
+ return NewAddNodeCmd(testID, "address",
"add")
},
result: &AddNodeCmd{
- id: testId,
+ id: testID,
Addr: "address",
SubCmd: "add",
},
@@ -68,11 +68,11 @@ var jsoncmdtests = []struct {
name: "basic remove",
cmd: "addnode",
f: func() (Cmd, error) {
- return NewAddNodeCmd(testId, "address",
+ return NewAddNodeCmd(testID, "address",
"remove")
},
result: &AddNodeCmd{
- id: testId,
+ id: testID,
Addr: "address",
SubCmd: "remove",
},
@@ -81,11 +81,11 @@ var jsoncmdtests = []struct {
name: "basic onetry",
cmd: "addnode",
f: func() (Cmd, error) {
- return NewAddNodeCmd(testId, "address",
+ return NewAddNodeCmd(testID, "address",
"onetry")
},
result: &AddNodeCmd{
- id: testId,
+ id: testID,
Addr: "address",
SubCmd: "onetry",
},
@@ -95,10 +95,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "backupwallet",
f: func() (Cmd, error) {
- return NewBackupWalletCmd(testId, "destination")
+ return NewBackupWalletCmd(testID, "destination")
},
result: &BackupWalletCmd{
- id: testId,
+ id: testID,
Destination: "destination",
},
},
@@ -106,11 +106,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "createmultisig",
f: func() (Cmd, error) {
- return NewCreateMultisigCmd(testId, 1,
+ return NewCreateMultisigCmd(testID, 1,
[]string{"key1", "key2", "key3"})
},
result: &CreateMultisigCmd{
- id: testId,
+ id: testID,
NRequired: 1,
Keys: []string{"key1", "key2", "key3"},
},
@@ -119,14 +119,14 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "createrawtransaction",
f: func() (Cmd, error) {
- return NewCreateRawTransactionCmd(testId,
+ return NewCreateRawTransactionCmd(testID,
[]TransactionInput{
{Txid: "tx1", Vout: 1},
{Txid: "tx2", Vout: 3}},
map[string]int64{"bob": 1, "bill": 2})
},
result: &CreateRawTransactionCmd{
- id: testId,
+ id: testID,
Inputs: []TransactionInput{
{Txid: "tx1", Vout: 1},
{Txid: "tx2", Vout: 3},
@@ -141,10 +141,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "debuglevel",
f: func() (Cmd, error) {
- return NewDebugLevelCmd(testId, "debug")
+ return NewDebugLevelCmd(testID, "debug")
},
result: &DebugLevelCmd{
- id: testId,
+ id: testID,
LevelSpec: "debug",
},
},
@@ -152,11 +152,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "decoderawtransaction",
f: func() (Cmd, error) {
- return NewDecodeRawTransactionCmd(testId,
+ return NewDecodeRawTransactionCmd(testID,
"thisisahexidecimaltransaction")
},
result: &DecodeRawTransactionCmd{
- id: testId,
+ id: testID,
HexTx: "thisisahexidecimaltransaction",
},
},
@@ -164,11 +164,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "decodescript",
f: func() (Cmd, error) {
- return NewDecodeScriptCmd(testId,
+ return NewDecodeScriptCmd(testID,
"a bunch of hex")
},
result: &DecodeScriptCmd{
- id: testId,
+ id: testID,
HexScript: "a bunch of hex",
},
},
@@ -176,11 +176,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "dumpprivkey",
f: func() (Cmd, error) {
- return NewDumpPrivKeyCmd(testId,
+ return NewDumpPrivKeyCmd(testID,
"address")
},
result: &DumpPrivKeyCmd{
- id: testId,
+ id: testID,
Address: "address",
},
},
@@ -188,11 +188,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "dumpwallet",
f: func() (Cmd, error) {
- return NewDumpWalletCmd(testId,
+ return NewDumpWalletCmd(testID,
"filename")
},
result: &DumpWalletCmd{
- id: testId,
+ id: testID,
Filename: "filename",
},
},
@@ -200,11 +200,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "encryptwallet",
f: func() (Cmd, error) {
- return NewEncryptWalletCmd(testId,
+ return NewEncryptWalletCmd(testID,
"passphrase")
},
result: &EncryptWalletCmd{
- id: testId,
+ id: testID,
Passphrase: "passphrase",
},
},
@@ -212,10 +212,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "estimatefee",
f: func() (Cmd, error) {
- return NewEstimateFeeCmd(testId, 1234)
+ return NewEstimateFeeCmd(testID, 1234)
},
result: &EstimateFeeCmd{
- id: testId,
+ id: testID,
NumBlocks: 1234,
},
},
@@ -223,10 +223,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "estimatepriority",
f: func() (Cmd, error) {
- return NewEstimatePriorityCmd(testId, 1234)
+ return NewEstimatePriorityCmd(testID, 1234)
},
result: &EstimatePriorityCmd{
- id: testId,
+ id: testID,
NumBlocks: 1234,
},
},
@@ -234,11 +234,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getaccount",
f: func() (Cmd, error) {
- return NewGetAccountCmd(testId,
+ return NewGetAccountCmd(testID,
"address")
},
result: &GetAccountCmd{
- id: testId,
+ id: testID,
Address: "address",
},
},
@@ -246,11 +246,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getaccountaddress",
f: func() (Cmd, error) {
- return NewGetAccountAddressCmd(testId,
+ return NewGetAccountAddressCmd(testID,
"account")
},
result: &GetAccountAddressCmd{
- id: testId,
+ id: testID,
Account: "account",
},
},
@@ -258,10 +258,10 @@ var jsoncmdtests = []struct {
name: "basic true",
cmd: "getaddednodeinfo",
f: func() (Cmd, error) {
- return NewGetAddedNodeInfoCmd(testId, true)
+ return NewGetAddedNodeInfoCmd(testID, true)
},
result: &GetAddedNodeInfoCmd{
- id: testId,
+ id: testID,
Dns: true,
},
},
@@ -269,10 +269,10 @@ var jsoncmdtests = []struct {
name: "basic false",
cmd: "getaddednodeinfo",
f: func() (Cmd, error) {
- return NewGetAddedNodeInfoCmd(testId, false)
+ return NewGetAddedNodeInfoCmd(testID, false)
},
result: &GetAddedNodeInfoCmd{
- id: testId,
+ id: testID,
Dns: false,
},
},
@@ -280,11 +280,11 @@ var jsoncmdtests = []struct {
name: "basic withnode",
cmd: "getaddednodeinfo",
f: func() (Cmd, error) {
- return NewGetAddedNodeInfoCmd(testId, true,
+ return NewGetAddedNodeInfoCmd(testID, true,
"thisisanode")
},
result: &GetAddedNodeInfoCmd{
- id: testId,
+ id: testID,
Dns: true,
Node: "thisisanode",
},
@@ -293,11 +293,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getaddressesbyaccount",
f: func() (Cmd, error) {
- return NewGetAddressesByAccountCmd(testId,
+ return NewGetAddressesByAccountCmd(testID,
"account")
},
result: &GetAddressesByAccountCmd{
- id: testId,
+ id: testID,
Account: "account",
},
},
@@ -305,10 +305,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getbalance",
f: func() (Cmd, error) {
- return NewGetBalanceCmd(testId)
+ return NewGetBalanceCmd(testID)
},
result: &GetBalanceCmd{
- id: testId,
+ id: testID,
MinConf: 1, // the default
},
},
@@ -316,10 +316,10 @@ var jsoncmdtests = []struct {
name: "basic + account",
cmd: "getbalance",
f: func() (Cmd, error) {
- return NewGetBalanceCmd(testId, "account")
+ return NewGetBalanceCmd(testID, "account")
},
result: &GetBalanceCmd{
- id: testId,
+ id: testID,
Account: "account",
MinConf: 1, // the default
},
@@ -328,10 +328,10 @@ var jsoncmdtests = []struct {
name: "basic + minconf",
cmd: "getbalance",
f: func() (Cmd, error) {
- return NewGetBalanceCmd(testId, "", 2)
+ return NewGetBalanceCmd(testID, "", 2)
},
result: &GetBalanceCmd{
- id: testId,
+ id: testID,
MinConf: 2,
},
},
@@ -339,10 +339,10 @@ var jsoncmdtests = []struct {
name: "basic + account + minconf",
cmd: "getbalance",
f: func() (Cmd, error) {
- return NewGetBalanceCmd(testId, "account", 2)
+ return NewGetBalanceCmd(testID, "account", 2)
},
result: &GetBalanceCmd{
- id: testId,
+ id: testID,
Account: "account",
MinConf: 2,
},
@@ -351,21 +351,21 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getbestblockhash",
f: func() (Cmd, error) {
- return NewGetBestBlockHashCmd(testId)
+ return NewGetBestBlockHashCmd(testID)
},
result: &GetBestBlockHashCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getblock",
f: func() (Cmd, error) {
- return NewGetBlockCmd(testId,
+ return NewGetBlockCmd(testID,
"somehash")
},
result: &GetBlockCmd{
- id: testId,
+ id: testID,
Hash: "somehash",
Verbose: true,
},
@@ -374,30 +374,30 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getblockchaininfo",
f: func() (Cmd, error) {
- return NewGetBlockChainInfoCmd(testId)
+ return NewGetBlockChainInfoCmd(testID)
},
result: &GetBlockChainInfoCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getblockcount",
f: func() (Cmd, error) {
- return NewGetBlockCountCmd(testId)
+ return NewGetBlockCountCmd(testID)
},
result: &GetBlockCountCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getblockhash",
f: func() (Cmd, error) {
- return NewGetBlockHashCmd(testId, 1234)
+ return NewGetBlockHashCmd(testID, 1234)
},
result: &GetBlockHashCmd{
- id: testId,
+ id: testID,
Index: 1234,
},
},
@@ -405,22 +405,22 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getblocktemplate",
f: func() (Cmd, error) {
- return NewGetBlockTemplateCmd(testId)
+ return NewGetBlockTemplateCmd(testID)
},
result: &GetBlockTemplateCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic + request",
cmd: "getblocktemplate",
f: func() (Cmd, error) {
- return NewGetBlockTemplateCmd(testId,
+ return NewGetBlockTemplateCmd(testID,
&TemplateRequest{Mode: "mode",
Capabilities: []string{"one", "two", "three"}})
},
result: &GetBlockTemplateCmd{
- id: testId,
+ id: testID,
Request: &TemplateRequest{
Mode: "mode",
Capabilities: []string{
@@ -435,12 +435,12 @@ var jsoncmdtests = []struct {
name: "basic + request no mode",
cmd: "getblocktemplate",
f: func() (Cmd, error) {
- return NewGetBlockTemplateCmd(testId,
+ return NewGetBlockTemplateCmd(testID,
&TemplateRequest{
Capabilities: []string{"one", "two", "three"}})
},
result: &GetBlockTemplateCmd{
- id: testId,
+ id: testID,
Request: &TemplateRequest{
Capabilities: []string{
"one",
@@ -454,80 +454,80 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getconnectioncount",
f: func() (Cmd, error) {
- return NewGetConnectionCountCmd(testId)
+ return NewGetConnectionCountCmd(testID)
},
result: &GetConnectionCountCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getdifficulty",
f: func() (Cmd, error) {
- return NewGetDifficultyCmd(testId)
+ return NewGetDifficultyCmd(testID)
},
result: &GetDifficultyCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getgenerate",
f: func() (Cmd, error) {
- return NewGetGenerateCmd(testId)
+ return NewGetGenerateCmd(testID)
},
result: &GetGenerateCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "gethashespersec",
f: func() (Cmd, error) {
- return NewGetHashesPerSecCmd(testId)
+ return NewGetHashesPerSecCmd(testID)
},
result: &GetHashesPerSecCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getinfo",
f: func() (Cmd, error) {
- return NewGetInfoCmd(testId)
+ return NewGetInfoCmd(testID)
},
result: &GetInfoCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getmininginfo",
f: func() (Cmd, error) {
- return NewGetMiningInfoCmd(testId)
+ return NewGetMiningInfoCmd(testID)
},
result: &GetMiningInfoCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getnettotals",
f: func() (Cmd, error) {
- return NewGetNetTotalsCmd(testId)
+ return NewGetNetTotalsCmd(testID)
},
result: &GetNetTotalsCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getnetworkhashps",
f: func() (Cmd, error) {
- return NewGetNetworkHashPSCmd(testId)
+ return NewGetNetworkHashPSCmd(testID)
},
result: &GetNetworkHashPSCmd{
- id: testId,
+ id: testID,
Blocks: 120,
Height: -1,
},
@@ -536,10 +536,10 @@ var jsoncmdtests = []struct {
name: "basic + blocks",
cmd: "getnetworkhashps",
f: func() (Cmd, error) {
- return NewGetNetworkHashPSCmd(testId, 5000)
+ return NewGetNetworkHashPSCmd(testID, 5000)
},
result: &GetNetworkHashPSCmd{
- id: testId,
+ id: testID,
Blocks: 5000,
Height: -1,
},
@@ -548,10 +548,10 @@ var jsoncmdtests = []struct {
name: "basic + blocks + height",
cmd: "getnetworkhashps",
f: func() (Cmd, error) {
- return NewGetNetworkHashPSCmd(testId, 5000, 1000)
+ return NewGetNetworkHashPSCmd(testID, 5000, 1000)
},
result: &GetNetworkHashPSCmd{
- id: testId,
+ id: testID,
Blocks: 5000,
Height: 1000,
},
@@ -560,20 +560,20 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getnetworkinfo",
f: func() (Cmd, error) {
- return NewGetNetworkInfoCmd(testId)
+ return NewGetNetworkInfoCmd(testID)
},
result: &GetNetworkInfoCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getnewaddress",
f: func() (Cmd, error) {
- return NewGetNewAddressCmd(testId, "account")
+ return NewGetNewAddressCmd(testID, "account")
},
result: &GetNewAddressCmd{
- id: testId,
+ id: testID,
Account: "account",
},
},
@@ -581,31 +581,31 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getpeerinfo",
f: func() (Cmd, error) {
- return NewGetPeerInfoCmd(testId)
+ return NewGetPeerInfoCmd(testID)
},
result: &GetPeerInfoCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getrawchangeaddress",
f: func() (Cmd, error) {
- return NewGetRawChangeAddressCmd(testId)
+ return NewGetRawChangeAddressCmd(testID)
},
result: &GetRawChangeAddressCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic + account",
cmd: "getrawchangeaddress",
f: func() (Cmd, error) {
- return NewGetRawChangeAddressCmd(testId,
+ return NewGetRawChangeAddressCmd(testID,
"accountname")
},
result: &GetRawChangeAddressCmd{
- id: testId,
+ id: testID,
Account: "accountname",
},
},
@@ -613,30 +613,30 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getrawmempool",
f: func() (Cmd, error) {
- return NewGetRawMempoolCmd(testId)
+ return NewGetRawMempoolCmd(testID)
},
result: &GetRawMempoolCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic noverbose",
cmd: "getrawmempool",
f: func() (Cmd, error) {
- return NewGetRawMempoolCmd(testId, false)
+ return NewGetRawMempoolCmd(testID, false)
},
result: &GetRawMempoolCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic verbose",
cmd: "getrawmempool",
f: func() (Cmd, error) {
- return NewGetRawMempoolCmd(testId, true)
+ return NewGetRawMempoolCmd(testID, true)
},
result: &GetRawMempoolCmd{
- id: testId,
+ id: testID,
Verbose: true,
},
},
@@ -644,11 +644,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getrawtransaction",
f: func() (Cmd, error) {
- return NewGetRawTransactionCmd(testId,
+ return NewGetRawTransactionCmd(testID,
"sometxid")
},
result: &GetRawTransactionCmd{
- id: testId,
+ id: testID,
Txid: "sometxid",
},
},
@@ -656,12 +656,12 @@ var jsoncmdtests = []struct {
name: "basic + verbose",
cmd: "getrawtransaction",
f: func() (Cmd, error) {
- return NewGetRawTransactionCmd(testId,
+ return NewGetRawTransactionCmd(testID,
"sometxid",
1)
},
result: &GetRawTransactionCmd{
- id: testId,
+ id: testID,
Txid: "sometxid",
Verbose: 1,
},
@@ -670,12 +670,12 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getreceivedbyaccount",
f: func() (Cmd, error) {
- return NewGetReceivedByAccountCmd(testId,
+ return NewGetReceivedByAccountCmd(testID,
"abtcaccount",
1)
},
result: &GetReceivedByAccountCmd{
- id: testId,
+ id: testID,
Account: "abtcaccount",
MinConf: 1,
},
@@ -684,12 +684,12 @@ var jsoncmdtests = []struct {
name: "basic + opt",
cmd: "getreceivedbyaccount",
f: func() (Cmd, error) {
- return NewGetReceivedByAccountCmd(testId,
+ return NewGetReceivedByAccountCmd(testID,
"abtcaccount",
2)
},
result: &GetReceivedByAccountCmd{
- id: testId,
+ id: testID,
Account: "abtcaccount",
MinConf: 2,
},
@@ -698,12 +698,12 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "getreceivedbyaddress",
f: func() (Cmd, error) {
- return NewGetReceivedByAddressCmd(testId,
+ return NewGetReceivedByAddressCmd(testID,
"abtcaddress",
1)
},
result: &GetReceivedByAddressCmd{
- id: testId,
+ id: testID,
Address: "abtcaddress",
MinConf: 1,
},
@@ -712,12 +712,12 @@ var jsoncmdtests = []struct {
name: "basic + opt",
cmd: "getreceivedbyaddress",
f: func() (Cmd, error) {
- return NewGetReceivedByAddressCmd(testId,
+ return NewGetReceivedByAddressCmd(testID,
"abtcaddress",
2)
},
result: &GetReceivedByAddressCmd{
- id: testId,
+ id: testID,
Address: "abtcaddress",
MinConf: 2,
},
@@ -726,11 +726,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "gettransaction",
f: func() (Cmd, error) {
- return NewGetTransactionCmd(testId,
+ return NewGetTransactionCmd(testID,
"atxid")
},
result: &GetTransactionCmd{
- id: testId,
+ id: testID,
Txid: "atxid",
},
},
@@ -738,12 +738,12 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "gettxout",
f: func() (Cmd, error) {
- return NewGetTxOutCmd(testId,
+ return NewGetTxOutCmd(testID,
"sometx",
10)
},
result: &GetTxOutCmd{
- id: testId,
+ id: testID,
Txid: "sometx",
Output: 10,
IncludeMempool: true,
@@ -753,13 +753,13 @@ var jsoncmdtests = []struct {
name: "basic + optional",
cmd: "gettxout",
f: func() (Cmd, error) {
- return NewGetTxOutCmd(testId,
+ return NewGetTxOutCmd(testID,
"sometx",
10,
false)
},
result: &GetTxOutCmd{
- id: testId,
+ id: testID,
Txid: "sometx",
Output: 10,
IncludeMempool: false,
@@ -769,20 +769,20 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "gettxoutsetinfo",
f: func() (Cmd, error) {
- return NewGetTxOutSetInfoCmd(testId)
+ return NewGetTxOutSetInfoCmd(testID)
},
result: &GetTxOutSetInfoCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "getwork",
f: func() (Cmd, error) {
- return NewGetWorkCmd(testId, "some data")
+ return NewGetWorkCmd(testID, "some data")
},
result: &GetWorkCmd{
- id: testId,
+ id: testID,
Data: "some data",
},
},
@@ -790,21 +790,21 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "help",
f: func() (Cmd, error) {
- return NewHelpCmd(testId)
+ return NewHelpCmd(testID)
},
result: &HelpCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic + optional cmd",
cmd: "help",
f: func() (Cmd, error) {
- return NewHelpCmd(testId,
+ return NewHelpCmd(testID,
"getinfo")
},
result: &HelpCmd{
- id: testId,
+ id: testID,
Command: "getinfo",
},
},
@@ -812,11 +812,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "importprivkey",
f: func() (Cmd, error) {
- return NewImportPrivKeyCmd(testId,
+ return NewImportPrivKeyCmd(testID,
"somereallongprivatekey")
},
result: &ImportPrivKeyCmd{
- id: testId,
+ id: testID,
PrivKey: "somereallongprivatekey",
Rescan: true,
},
@@ -825,12 +825,12 @@ var jsoncmdtests = []struct {
name: "basic + 1 opt",
cmd: "importprivkey",
f: func() (Cmd, error) {
- return NewImportPrivKeyCmd(testId,
+ return NewImportPrivKeyCmd(testID,
"somereallongprivatekey",
"some text")
},
result: &ImportPrivKeyCmd{
- id: testId,
+ id: testID,
PrivKey: "somereallongprivatekey",
Label: "some text",
Rescan: true,
@@ -840,13 +840,13 @@ var jsoncmdtests = []struct {
name: "basic + 2 opts",
cmd: "importprivkey",
f: func() (Cmd, error) {
- return NewImportPrivKeyCmd(testId,
+ return NewImportPrivKeyCmd(testID,
"somereallongprivatekey",
"some text",
false)
},
result: &ImportPrivKeyCmd{
- id: testId,
+ id: testID,
PrivKey: "somereallongprivatekey",
Label: "some text",
Rescan: false,
@@ -856,11 +856,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "importwallet",
f: func() (Cmd, error) {
- return NewImportWalletCmd(testId,
+ return NewImportWalletCmd(testID,
"walletfilename.dat")
},
result: &ImportWalletCmd{
- id: testId,
+ id: testID,
Filename: "walletfilename.dat",
},
},
@@ -868,20 +868,20 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "keypoolrefill",
f: func() (Cmd, error) {
- return NewKeyPoolRefillCmd(testId)
+ return NewKeyPoolRefillCmd(testID)
},
result: &KeyPoolRefillCmd{
- id: testId,
+ id: testID,
},
},
{
name: "newsize",
cmd: "keypoolrefill",
f: func() (Cmd, error) {
- return NewKeyPoolRefillCmd(testId, 1000000)
+ return NewKeyPoolRefillCmd(testID, 1000000)
},
result: &KeyPoolRefillCmd{
- id: testId,
+ id: testID,
NewSize: 1000000,
},
},
@@ -889,10 +889,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "listaccounts",
f: func() (Cmd, error) {
- return NewListAccountsCmd(testId, 1)
+ return NewListAccountsCmd(testID, 1)
},
result: &ListAccountsCmd{
- id: testId,
+ id: testID,
MinConf: 1,
},
},
@@ -900,10 +900,10 @@ var jsoncmdtests = []struct {
name: "basic + opt",
cmd: "listaccounts",
f: func() (Cmd, error) {
- return NewListAccountsCmd(testId, 2)
+ return NewListAccountsCmd(testID, 2)
},
result: &ListAccountsCmd{
- id: testId,
+ id: testID,
MinConf: 2,
},
},
@@ -911,30 +911,30 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "listaddressgroupings",
f: func() (Cmd, error) {
- return NewListAddressGroupingsCmd(testId)
+ return NewListAddressGroupingsCmd(testID)
},
result: &ListAddressGroupingsCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "listlockunspent",
f: func() (Cmd, error) {
- return NewListLockUnspentCmd(testId)
+ return NewListLockUnspentCmd(testID)
},
result: &ListLockUnspentCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "listreceivedbyaccount",
f: func() (Cmd, error) {
- return NewListReceivedByAccountCmd(testId)
+ return NewListReceivedByAccountCmd(testID)
},
result: &ListReceivedByAccountCmd{
- id: testId,
+ id: testID,
MinConf: 1,
},
},
@@ -942,10 +942,10 @@ var jsoncmdtests = []struct {
name: "basic + 1 opt",
cmd: "listreceivedbyaccount",
f: func() (Cmd, error) {
- return NewListReceivedByAccountCmd(testId, 2)
+ return NewListReceivedByAccountCmd(testID, 2)
},
result: &ListReceivedByAccountCmd{
- id: testId,
+ id: testID,
MinConf: 2,
},
},
@@ -953,10 +953,10 @@ var jsoncmdtests = []struct {
name: "basic + 2 opt",
cmd: "listreceivedbyaccount",
f: func() (Cmd, error) {
- return NewListReceivedByAccountCmd(testId, 2, true)
+ return NewListReceivedByAccountCmd(testID, 2, true)
},
result: &ListReceivedByAccountCmd{
- id: testId,
+ id: testID,
MinConf: 2,
IncludeEmpty: true,
},
@@ -965,10 +965,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "listreceivedbyaddress",
f: func() (Cmd, error) {
- return NewListReceivedByAddressCmd(testId)
+ return NewListReceivedByAddressCmd(testID)
},
result: &ListReceivedByAddressCmd{
- id: testId,
+ id: testID,
MinConf: 1,
},
},
@@ -976,10 +976,10 @@ var jsoncmdtests = []struct {
name: "basic + 1 opt",
cmd: "listreceivedbyaddress",
f: func() (Cmd, error) {
- return NewListReceivedByAddressCmd(testId, 2)
+ return NewListReceivedByAddressCmd(testID, 2)
},
result: &ListReceivedByAddressCmd{
- id: testId,
+ id: testID,
MinConf: 2,
},
},
@@ -987,10 +987,10 @@ var jsoncmdtests = []struct {
name: "basic + 2 opt",
cmd: "listreceivedbyaddress",
f: func() (Cmd, error) {
- return NewListReceivedByAddressCmd(testId, 2, true)
+ return NewListReceivedByAddressCmd(testID, 2, true)
},
result: &ListReceivedByAddressCmd{
- id: testId,
+ id: testID,
MinConf: 2,
IncludeEmpty: true,
},
@@ -999,10 +999,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "listsinceblock",
f: func() (Cmd, error) {
- return NewListSinceBlockCmd(testId)
+ return NewListSinceBlockCmd(testID)
},
result: &ListSinceBlockCmd{
- id: testId,
+ id: testID,
TargetConfirmations: 1,
},
},
@@ -1010,10 +1010,10 @@ var jsoncmdtests = []struct {
name: "basic + 1 ops",
cmd: "listsinceblock",
f: func() (Cmd, error) {
- return NewListSinceBlockCmd(testId, "someblockhash")
+ return NewListSinceBlockCmd(testID, "someblockhash")
},
result: &ListSinceBlockCmd{
- id: testId,
+ id: testID,
BlockHash: "someblockhash",
TargetConfirmations: 1,
},
@@ -1022,10 +1022,10 @@ var jsoncmdtests = []struct {
name: "basic + 2 ops",
cmd: "listsinceblock",
f: func() (Cmd, error) {
- return NewListSinceBlockCmd(testId, "someblockhash", 3)
+ return NewListSinceBlockCmd(testID, "someblockhash", 3)
},
result: &ListSinceBlockCmd{
- id: testId,
+ id: testID,
BlockHash: "someblockhash",
TargetConfirmations: 3,
},
@@ -1034,10 +1034,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "listtransactions",
f: func() (Cmd, error) {
- return NewListTransactionsCmd(testId)
+ return NewListTransactionsCmd(testID)
},
result: &ListTransactionsCmd{
- id: testId,
+ id: testID,
Account: "",
Count: 10,
From: 0,
@@ -1047,10 +1047,10 @@ var jsoncmdtests = []struct {
name: "+ 1 optarg",
cmd: "listtransactions",
f: func() (Cmd, error) {
- return NewListTransactionsCmd(testId, "abcde")
+ return NewListTransactionsCmd(testID, "abcde")
},
result: &ListTransactionsCmd{
- id: testId,
+ id: testID,
Account: "abcde",
Count: 10,
From: 0,
@@ -1060,10 +1060,10 @@ var jsoncmdtests = []struct {
name: "+ 2 optargs",
cmd: "listtransactions",
f: func() (Cmd, error) {
- return NewListTransactionsCmd(testId, "abcde", 123)
+ return NewListTransactionsCmd(testID, "abcde", 123)
},
result: &ListTransactionsCmd{
- id: testId,
+ id: testID,
Account: "abcde",
Count: 123,
From: 0,
@@ -1073,10 +1073,10 @@ var jsoncmdtests = []struct {
name: "+ 3 optargs",
cmd: "listtransactions",
f: func() (Cmd, error) {
- return NewListTransactionsCmd(testId, "abcde", 123, 456)
+ return NewListTransactionsCmd(testID, "abcde", 123, 456)
},
result: &ListTransactionsCmd{
- id: testId,
+ id: testID,
Account: "abcde",
Count: 123,
From: 456,
@@ -1086,10 +1086,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "listunspent",
f: func() (Cmd, error) {
- return NewListUnspentCmd(testId)
+ return NewListUnspentCmd(testID)
},
result: &ListUnspentCmd{
- id: testId,
+ id: testID,
MinConf: 1,
MaxConf: 999999,
},
@@ -1098,10 +1098,10 @@ var jsoncmdtests = []struct {
name: "basic + opts",
cmd: "listunspent",
f: func() (Cmd, error) {
- return NewListUnspentCmd(testId, 0, 6)
+ return NewListUnspentCmd(testID, 0, 6)
},
result: &ListUnspentCmd{
- id: testId,
+ id: testID,
MinConf: 0,
MaxConf: 6,
},
@@ -1110,12 +1110,12 @@ var jsoncmdtests = []struct {
name: "basic + opts + addresses",
cmd: "listunspent",
f: func() (Cmd, error) {
- return NewListUnspentCmd(testId, 0, 6, []string{
+ return NewListUnspentCmd(testID, 0, 6, []string{
"a", "b", "c",
})
},
result: &ListUnspentCmd{
- id: testId,
+ id: testID,
MinConf: 0,
MaxConf: 6,
Addresses: []string{"a", "b", "c"},
@@ -1125,10 +1125,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "lockunspent",
f: func() (Cmd, error) {
- return NewLockUnspentCmd(testId, true)
+ return NewLockUnspentCmd(testID, true)
},
result: &LockUnspentCmd{
- id: testId,
+ id: testID,
Unlock: true,
},
},
@@ -1136,14 +1136,14 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "move",
f: func() (Cmd, error) {
- return NewMoveCmd(testId,
+ return NewMoveCmd(testID,
"account1",
"account2",
12,
1)
},
result: &MoveCmd{
- id: testId,
+ id: testID,
FromAccount: "account1",
ToAccount: "account2",
Amount: 12,
@@ -1154,7 +1154,7 @@ var jsoncmdtests = []struct {
name: "basic + optionals",
cmd: "move",
f: func() (Cmd, error) {
- return NewMoveCmd(testId,
+ return NewMoveCmd(testID,
"account1",
"account2",
12,
@@ -1162,7 +1162,7 @@ var jsoncmdtests = []struct {
"some comment")
},
result: &MoveCmd{
- id: testId,
+ id: testID,
FromAccount: "account1",
ToAccount: "account2",
Amount: 12,
@@ -1174,24 +1174,24 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "ping",
f: func() (Cmd, error) {
- return NewPingCmd(testId)
+ return NewPingCmd(testID)
},
result: &PingCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "sendfrom",
f: func() (Cmd, error) {
- return NewSendFromCmd(testId,
+ return NewSendFromCmd(testID,
"account",
"address",
12,
1)
},
result: &SendFromCmd{
- id: testId,
+ id: testID,
FromAccount: "account",
ToAddress: "address",
Amount: 12,
@@ -1202,7 +1202,7 @@ var jsoncmdtests = []struct {
name: "basic + options",
cmd: "sendfrom",
f: func() (Cmd, error) {
- return NewSendFromCmd(testId,
+ return NewSendFromCmd(testID,
"account",
"address",
12,
@@ -1211,7 +1211,7 @@ var jsoncmdtests = []struct {
"comment to")
},
result: &SendFromCmd{
- id: testId,
+ id: testID,
FromAccount: "account",
ToAddress: "address",
Amount: 12,
@@ -1229,12 +1229,12 @@ var jsoncmdtests = []struct {
"address B": 2000,
"address C": 3000,
}
- return NewSendManyCmd(testId,
+ return NewSendManyCmd(testID,
"account",
pairs)
},
result: &SendManyCmd{
- id: testId,
+ id: testID,
FromAccount: "account",
Amounts: map[string]int64{
"address A": 1000,
@@ -1253,14 +1253,14 @@ var jsoncmdtests = []struct {
"address B": 2000,
"address C": 3000,
}
- return NewSendManyCmd(testId,
+ return NewSendManyCmd(testID,
"account",
pairs,
10,
"comment")
},
result: &SendManyCmd{
- id: testId,
+ id: testID,
FromAccount: "account",
Amounts: map[string]int64{
"address A": 1000,
@@ -1275,11 +1275,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "sendrawtransaction",
f: func() (Cmd, error) {
- return NewSendRawTransactionCmd(testId,
+ return NewSendRawTransactionCmd(testID,
"hexstringofatx")
},
result: &SendRawTransactionCmd{
- id: testId,
+ id: testID,
HexTx: "hexstringofatx",
},
},
@@ -1287,11 +1287,11 @@ var jsoncmdtests = []struct {
name: "allowhighfees: false",
cmd: "sendrawtransaction",
f: func() (Cmd, error) {
- return NewSendRawTransactionCmd(testId,
+ return NewSendRawTransactionCmd(testID,
"hexstringofatx", false)
},
result: &SendRawTransactionCmd{
- id: testId,
+ id: testID,
HexTx: "hexstringofatx",
},
},
@@ -1299,11 +1299,11 @@ var jsoncmdtests = []struct {
name: "allowhighfees: true",
cmd: "sendrawtransaction",
f: func() (Cmd, error) {
- return NewSendRawTransactionCmd(testId,
+ return NewSendRawTransactionCmd(testID,
"hexstringofatx", true)
},
result: &SendRawTransactionCmd{
- id: testId,
+ id: testID,
HexTx: "hexstringofatx",
AllowHighFees: true,
},
@@ -1312,12 +1312,12 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "sendtoaddress",
f: func() (Cmd, error) {
- return NewSendToAddressCmd(testId,
+ return NewSendToAddressCmd(testID,
"somebtcaddress",
1)
},
result: &SendToAddressCmd{
- id: testId,
+ id: testID,
Address: "somebtcaddress",
Amount: 1,
},
@@ -1326,14 +1326,14 @@ var jsoncmdtests = []struct {
name: "basic + optional",
cmd: "sendtoaddress",
f: func() (Cmd, error) {
- return NewSendToAddressCmd(testId,
+ return NewSendToAddressCmd(testID,
"somebtcaddress",
1,
"a comment",
"comment to")
},
result: &SendToAddressCmd{
- id: testId,
+ id: testID,
Address: "somebtcaddress",
Amount: 1,
Comment: "a comment",
@@ -1344,12 +1344,12 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "setaccount",
f: func() (Cmd, error) {
- return NewSetAccountCmd(testId,
+ return NewSetAccountCmd(testID,
"somebtcaddress",
"account name")
},
result: &SetAccountCmd{
- id: testId,
+ id: testID,
Address: "somebtcaddress",
Account: "account name",
},
@@ -1358,10 +1358,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "setgenerate",
f: func() (Cmd, error) {
- return NewSetGenerateCmd(testId, true)
+ return NewSetGenerateCmd(testID, true)
},
result: &SetGenerateCmd{
- id: testId,
+ id: testID,
Generate: true,
GenProcLimit: -1,
},
@@ -1370,10 +1370,10 @@ var jsoncmdtests = []struct {
name: "basic + optional",
cmd: "setgenerate",
f: func() (Cmd, error) {
- return NewSetGenerateCmd(testId, true, 10)
+ return NewSetGenerateCmd(testID, true, 10)
},
result: &SetGenerateCmd{
- id: testId,
+ id: testID,
Generate: true,
GenProcLimit: 10,
},
@@ -1382,10 +1382,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "settxfee",
f: func() (Cmd, error) {
- return NewSetTxFeeCmd(testId, 10)
+ return NewSetTxFeeCmd(testID, 10)
},
result: &SetTxFeeCmd{
- id: testId,
+ id: testID,
Amount: 10,
},
},
@@ -1393,12 +1393,12 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "signmessage",
f: func() (Cmd, error) {
- return NewSignMessageCmd(testId,
+ return NewSignMessageCmd(testID,
"btcaddress",
"a message")
},
result: &SignMessageCmd{
- id: testId,
+ id: testID,
Address: "btcaddress",
Message: "a message",
},
@@ -1407,11 +1407,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "signrawtransaction",
f: func() (Cmd, error) {
- return NewSignRawTransactionCmd(testId,
+ return NewSignRawTransactionCmd(testID,
"sometxstring")
},
result: &SignRawTransactionCmd{
- id: testId,
+ id: testID,
RawTx: "sometxstring",
},
},
@@ -1419,7 +1419,7 @@ var jsoncmdtests = []struct {
name: "basic + optional",
cmd: "signrawtransaction",
f: func() (Cmd, error) {
- return NewSignRawTransactionCmd(testId,
+ return NewSignRawTransactionCmd(testID,
"sometxstring",
[]RawTxInput{
RawTxInput{
@@ -1433,7 +1433,7 @@ var jsoncmdtests = []struct {
"flags")
},
result: &SignRawTransactionCmd{
- id: testId,
+ id: testID,
RawTx: "sometxstring",
Inputs: []RawTxInput{
RawTxInput{
@@ -1451,21 +1451,21 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "stop",
f: func() (Cmd, error) {
- return NewStopCmd(testId)
+ return NewStopCmd(testID)
},
result: &StopCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "submitblock",
f: func() (Cmd, error) {
- return NewSubmitBlockCmd(testId,
+ return NewSubmitBlockCmd(testID,
"lotsofhex")
},
result: &SubmitBlockCmd{
- id: testId,
+ id: testID,
HexBlock: "lotsofhex",
},
},
@@ -1473,12 +1473,12 @@ var jsoncmdtests = []struct {
name: "+ optional object",
cmd: "submitblock",
f: func() (Cmd, error) {
- return NewSubmitBlockCmd(testId,
+ return NewSubmitBlockCmd(testID,
"lotsofhex",
&SubmitBlockOptions{WorkID: "otherstuff"})
},
result: &SubmitBlockCmd{
- id: testId,
+ id: testID,
HexBlock: "lotsofhex",
Options: &SubmitBlockOptions{WorkID: "otherstuff"},
},
@@ -1487,11 +1487,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "validateaddress",
f: func() (Cmd, error) {
- return NewValidateAddressCmd(testId,
+ return NewValidateAddressCmd(testID,
"somebtcaddress")
},
result: &ValidateAddressCmd{
- id: testId,
+ id: testID,
Address: "somebtcaddress",
},
},
@@ -1499,10 +1499,10 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "verifychain",
f: func() (Cmd, error) {
- return NewVerifyChainCmd(testId)
+ return NewVerifyChainCmd(testID)
},
result: &VerifyChainCmd{
- id: testId,
+ id: testID,
CheckLevel: 3,
CheckDepth: 288,
},
@@ -1511,10 +1511,10 @@ var jsoncmdtests = []struct {
name: "basic + optional",
cmd: "verifychain",
f: func() (Cmd, error) {
- return NewVerifyChainCmd(testId, 4, 1)
+ return NewVerifyChainCmd(testID, 4, 1)
},
result: &VerifyChainCmd{
- id: testId,
+ id: testID,
CheckLevel: 4,
CheckDepth: 1,
},
@@ -1523,13 +1523,13 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "verifymessage",
f: func() (Cmd, error) {
- return NewVerifyMessageCmd(testId,
+ return NewVerifyMessageCmd(testID,
"someaddress",
"somesig",
"a message")
},
result: &VerifyMessageCmd{
- id: testId,
+ id: testID,
Address: "someaddress",
Signature: "somesig",
Message: "a message",
@@ -1539,22 +1539,22 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "walletlock",
f: func() (Cmd, error) {
- return NewWalletLockCmd(testId)
+ return NewWalletLockCmd(testID)
},
result: &WalletLockCmd{
- id: testId,
+ id: testID,
},
},
{
name: "basic",
cmd: "walletpassphrase",
f: func() (Cmd, error) {
- return NewWalletPassphraseCmd(testId,
+ return NewWalletPassphraseCmd(testID,
"phrase1",
10)
},
result: &WalletPassphraseCmd{
- id: testId,
+ id: testID,
Passphrase: "phrase1",
Timeout: 10,
},
@@ -1563,11 +1563,11 @@ var jsoncmdtests = []struct {
name: "basic",
cmd: "walletpassphrasechange",
f: func() (Cmd, error) {
- return NewWalletPassphraseChangeCmd(testId,
+ return NewWalletPassphraseChangeCmd(testID,
"phrase1", "phrase2")
},
result: &WalletPassphraseChangeCmd{
- id: testId,
+ id: testID,
OldPassphrase: "phrase1",
NewPassphrase: "phrase2",
},
@@ -1599,7 +1599,7 @@ func TestCmds(t *testing.T) {
}
id, ok := (c.Id()).(float64)
- if !ok || id != testId {
+ if !ok || id != testID {
t.Errorf("%s: id not returned properly", name)
}
diff --git a/jsonfxns.go b/jsonfxns.go
index 5bf2cfda..98339a0c 100644
--- a/jsonfxns.go
+++ b/jsonfxns.go
@@ -70,7 +70,7 @@ func GetRaw(resp io.ReadCloser) ([]byte, error) {
body, err := ioutil.ReadAll(resp)
resp.Close()
if err != nil {
- err = fmt.Errorf("Error reading json reply: %v", err)
+ err = fmt.Errorf("error reading json reply: %v", err)
return body, err
}
return body, nil
diff --git a/jsonresults.go b/jsonresults.go
index e5f41046..452164cc 100644
--- a/jsonresults.go
+++ b/jsonresults.go
@@ -71,7 +71,7 @@ type GetBlockChainInfoResult struct {
ChainWork string `json:"chainwork"`
}
-// GetBlockTemplateResultTransaction models the transactions field of the
+// GetBlockTemplateResultTx models the transactions field of the
// getblocktemplate command.
type GetBlockTemplateResultTx struct {
Data string `json:"data"`
@@ -437,9 +437,9 @@ func ReadResultCmd(cmd string, message []byte) (Reply, error) {
err = json.Unmarshal(message, &objmap)
if err != nil {
if strings.Contains(string(message), "401 Unauthorized.") {
- err = fmt.Errorf("Authentication error.")
+ err = fmt.Errorf("authentication error")
} else {
- err = fmt.Errorf("Error unmarshalling json reply: %v", err)
+ err = fmt.Errorf("error unmarshalling json reply: %v", err)
}
return result, err
}
@@ -448,12 +448,12 @@ func ReadResultCmd(cmd string, message []byte) (Reply, error) {
var id interface{}
err = json.Unmarshal(objmap["error"], &jsonErr)
if err != nil {
- err = fmt.Errorf("Error unmarshalling json reply: %v", err)
+ err = fmt.Errorf("error unmarshalling json reply: %v", err)
return result, err
}
err = json.Unmarshal(objmap["id"], &id)
if err != nil {
- err = fmt.Errorf("Error unmarshalling json reply: %v", err)
+ err = fmt.Errorf("error unmarshalling json reply: %v", err)
return result, err
}
@@ -709,7 +709,7 @@ func ReadResultCmd(cmd string, message []byte) (Reply, error) {
}
}
if err != nil {
- err = fmt.Errorf("Error unmarshalling json reply: %v", err)
+ err = fmt.Errorf("error unmarshalling json reply: %v", err)
return result, err
}
// Only want the error field when there is an actual error to report.