Mirroristas/kaspad
2
0
Fork 0
mirror of https://github.com/kaspanet/kaspad.git synced 2025-05-30 10:46:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make golint happy with btcctl.

Browse Source
This commit is contained in:
Dave Collins 2013-11-19 20:35:49 -06:00
parent b1ed5f75ca
commit 9643cb6d23
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
util/btcctl/btcctl.go
View File

@ -33,6 +33,7 @@ type handlerData struct {
usage string usage string
} }
// Errors used in the various handlers.
var ( var (
ErrNoData = errors.New("No data returned.") ErrNoData = errors.New("No data returned.")
ErrNoDisplayHandler = errors.New("No display handler specified.") 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) { func send(cfg *config, msg []byte) (interface{}, error) {
var reply btcjson.Reply var reply btcjson.Reply
var err error var err error
if cfg.RpcCert != "" || cfg.TlsSkipVerify { if cfg.RPCCert != "" || cfg.TlsSkipVerify {
var pem []byte var pem []byte
if cfg.RpcCert != "" { if cfg.RPCCert != "" {
pem, err = ioutil.ReadFile(cfg.RpcCert) pem, err = ioutil.ReadFile(cfg.RPCCert)
if err != nil { if err != nil {
return nil, err return nil, err
} }
} }
reply, err = btcjson.TlsRpcCommand(cfg.RpcUser, reply, err = btcjson.TlsRpcCommand(cfg.RPCUser,
cfg.RpcPassword, cfg.RpcServer, msg, pem, cfg.RPCPassword, cfg.RPCServer, msg, pem,
cfg.TlsSkipVerify) cfg.TlsSkipVerify)
} else { } else {
reply, err = btcjson.RpcCommand(cfg.RpcUser, cfg.RpcPassword, reply, err = btcjson.RpcCommand(cfg.RPCUser, cfg.RPCPassword,
cfg.RpcServer, msg) cfg.RPCServer, msg)
} }
if err != nil { if err != nil {
return nil, err return nil, err

12
util/btcctl/config.go
View File

@ -22,10 +22,10 @@ var (
type config struct { type config struct {
ShowVersion bool `short:"V" long:"version" description:"Display version information and exit"` ShowVersion bool `short:"V" long:"version" description:"Display version information and exit"`
ConfigFile string `short:"C" long:"configfile" description:"Path to configuration file"` ConfigFile string `short:"C" long:"configfile" description:"Path to configuration file"`
RpcUser string `short:"u" long:"rpcuser" description:"RPC username"` RPCUser string `short:"u" long:"rpcuser" description:"RPC username"`
RpcPassword string `short:"P" long:"rpcpass" default-mask:"-" description:"RPC password"` RPCPassword string `short:"P" long:"rpcpass" default-mask:"-" description:"RPC password"`
RpcServer string `short:"s" long:"rpcserver" description:"RPC server to connect to"` 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"` 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!)"` 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. // Default config.
cfg := config{ cfg := config{
ConfigFile: defaultConfigFile, ConfigFile: defaultConfigFile,
RpcServer: "localhost:8334", RPCServer: "localhost:8334",
RpcCert: defaultRPCCertFile, RPCCert: defaultRPCCertFile,
} }
// Pre-parse the command line options to see if an alternative config // Pre-parse the command line options to see if an alternative config