From 9643cb6d23039c5914310596317a5f0e2d8ee2f1 Mon Sep 17 00:00:00 2001
From: Dave Collins <davec@conformal.com>
Date: Tue, 19 Nov 2013 20:35:49 -0600
Subject: [PATCH] Make golint happy with btcctl.

---
 util/btcctl/btcctl.go | 15 ++++++++-------
 util/btcctl/config.go | 12 ++++++------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/util/btcctl/btcctl.go b/util/btcctl/btcctl.go
index 2cbb0b1b4..7cbaec30a 100644
--- a/util/btcctl/btcctl.go
+++ b/util/btcctl/btcctl.go
@@ -33,6 +33,7 @@ type handlerData struct {
 	usage              string
 }
 
+// Errors used in the various handlers.
 var (
 	ErrNoData           = errors.New("No data returned.")
 	ErrNoDisplayHandler = errors.New("No display handler specified.")
@@ -229,20 +230,20 @@ func makeVerifyChain(args []interface{}) (btcjson.Cmd, error) {
 func send(cfg *config, msg []byte) (interface{}, error) {
 	var reply btcjson.Reply
 	var err error
-	if cfg.RpcCert != "" || cfg.TlsSkipVerify {
+	if cfg.RPCCert != "" || cfg.TlsSkipVerify {
 		var pem []byte
-		if cfg.RpcCert != "" {
-			pem, err = ioutil.ReadFile(cfg.RpcCert)
+		if cfg.RPCCert != "" {
+			pem, err = ioutil.ReadFile(cfg.RPCCert)
 			if err != nil {
 				return nil, err
 			}
 		}
-		reply, err = btcjson.TlsRpcCommand(cfg.RpcUser,
-			cfg.RpcPassword, cfg.RpcServer, msg, pem,
+		reply, err = btcjson.TlsRpcCommand(cfg.RPCUser,
+			cfg.RPCPassword, cfg.RPCServer, msg, pem,
 			cfg.TlsSkipVerify)
 	} else {
-		reply, err = btcjson.RpcCommand(cfg.RpcUser, cfg.RpcPassword,
-			cfg.RpcServer, msg)
+		reply, err = btcjson.RpcCommand(cfg.RPCUser, cfg.RPCPassword,
+			cfg.RPCServer, msg)
 	}
 	if err != nil {
 		return nil, err
diff --git a/util/btcctl/config.go b/util/btcctl/config.go
index 642ea793e..49f88fd5b 100644
--- a/util/btcctl/config.go
+++ b/util/btcctl/config.go
@@ -22,10 +22,10 @@ var (
 type config struct {
 	ShowVersion   bool   `short:"V" long:"version" description:"Display version information and exit"`
 	ConfigFile    string `short:"C" long:"configfile" description:"Path to configuration file"`
-	RpcUser       string `short:"u" long:"rpcuser" description:"RPC username"`
-	RpcPassword   string `short:"P" long:"rpcpass" default-mask:"-" description:"RPC password"`
-	RpcServer     string `short:"s" long:"rpcserver" description:"RPC server to connect to"`
-	RpcCert       string `short:"c" long:"rpccert" description:"RPC server certificate chain for validation"`
+	RPCUser       string `short:"u" long:"rpcuser" description:"RPC username"`
+	RPCPassword   string `short:"P" long:"rpcpass" default-mask:"-" description:"RPC password"`
+	RPCServer     string `short:"s" long:"rpcserver" description:"RPC server to connect to"`
+	RPCCert       string `short:"c" long:"rpccert" description:"RPC server certificate chain for validation"`
 	TlsSkipVerify bool   `long:"skipverify" description:"Do not verify tls certificates (not recommended!)"`
 }
 
@@ -45,8 +45,8 @@ func loadConfig() (*flags.Parser, *config, []string, error) {
 	// Default config.
 	cfg := config{
 		ConfigFile: defaultConfigFile,
-		RpcServer:  "localhost:8334",
-		RpcCert:    defaultRPCCertFile,
+		RPCServer:  "localhost:8334",
+		RPCCert:    defaultRPCCertFile,
 	}
 
 	// Pre-parse the command line options to see if an alternative config