From 8d9b8fcf82500c0d6332025321ebf5229e1705e8 Mon Sep 17 00:00:00 2001
From: Josh Rickmar <jrick@devio.us>
Date: Tue, 19 Nov 2013 15:26:47 -0500
Subject: [PATCH] Make importprivkey rescan optarg default to true.
---
jsoncmd.go | 6 +++---
jsoncmd_test.go | 1 +
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/jsoncmd.go b/jsoncmd.go
index 0f91688d..1bb85c45 100644
--- a/jsoncmd.go
+++ b/jsoncmd.go
@@ -3520,7 +3520,7 @@ var _ Cmd = &ImportPrivKeyCmd{}
// pointer to a TemplateRequest may be provided.
func NewImportPrivKeyCmd(id interface{}, privkey string, optArgs ...interface{}) (*ImportPrivKeyCmd, error) {
var label string
- var rescan bool
+ rescan := true
var ok bool
if len(optArgs) > 2 {
@@ -3567,11 +3567,11 @@ func (cmd *ImportPrivKeyCmd) MarshalJSON() ([]byte, error) {
},
}
- if cmd.Label != "" || cmd.Rescan {
+ if cmd.Label != "" || !cmd.Rescan {
raw.Params = append(raw.Params, cmd.Label)
}
- if cmd.Rescan {
+ if !cmd.Rescan {
raw.Params = append(raw.Params, cmd.Rescan)
}
return json.Marshal(raw)
diff --git a/jsoncmd_test.go b/jsoncmd_test.go
index c206a604..f5465c33 100644
--- a/jsoncmd_test.go
+++ b/jsoncmd_test.go
@@ -670,6 +670,7 @@ var jsoncmdtests = []struct {
result: &ImportPrivKeyCmd{
id: float64(1),
PrivKey: "somereallongprivatekey",
+ Rescan: true,
},
},
{