LBRYCommunity/lbcd
1
0
Fork 0
Code Issues 17 Pull requests 4 Projects Releases 28 Packages 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
}
// 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

12
util/btcctl/config.go
View file

@ -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