From 90063e14310b4ca998c0e1c8b6706c41ef50a728 Mon Sep 17 00:00:00 2001 From: Olaoluwa Osuntokun Date: Tue, 22 Mar 2016 13:30:54 -0700 Subject: [PATCH] run go fmt on config file --- config.go | 65 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 33 insertions(+), 32 deletions(-) diff --git a/config.go b/config.go index 8c326652..ffa8d7eb 100644 --- a/config.go +++ b/config.go @@ -1,12 +1,13 @@ package main import ( + "io/ioutil" + "os" + "path/filepath" + "github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcutil" flags "github.com/btcsuite/go-flags" - "path/filepath" - "io/ioutil" - "os" ) const ( @@ -31,20 +32,20 @@ var ( ) type config struct { - ConfigFile string `short:"C" long:"configfile" description:"Path to configuration file"` - DataDir string `short:"b" long:"datadir" description:"The directory to store lnd's data within"` - PeerPort int `long:"peerport" description:"The port to listen on for incoming p2p connections"` - RPCPort int `long:"rpcport" description:"The port for the rpc server"` - SPVMode bool `long:"spv" description:"assert to enter spv wallet mode"` - BTCDHost string `long:"btcdhost" description:"The BTCD RPC address. "` - BTCDUser string `long:"btcduser" description:"The BTCD RPC user"` - BTCDPass string `long:"btcdpass" description:"The BTCD RPC password"` - BTCDNoTLS bool `long:"btcdnotls" description:"Do not use TLS for RPC connection to BTCD"` + ConfigFile string `short:"C" long:"configfile" description:"Path to configuration file"` + DataDir string `short:"b" long:"datadir" description:"The directory to store lnd's data within"` + PeerPort int `long:"peerport" description:"The port to listen on for incoming p2p connections"` + RPCPort int `long:"rpcport" description:"The port for the rpc server"` + SPVMode bool `long:"spv" description:"assert to enter spv wallet mode"` + BTCDHost string `long:"btcdhost" description:"The BTCD RPC address. "` + BTCDUser string `long:"btcduser" description:"The BTCD RPC user"` + BTCDPass string `long:"btcdpass" description:"The BTCD RPC password"` + BTCDNoTLS bool `long:"btcdnotls" description:"Do not use TLS for RPC connection to BTCD"` BTCDCACertPath string `long:"btcdcacert" description:"Path to certificate for BTCD RPC"` - UseRegtest bool `long:"regtest" description:"Use RegNet. If not specified TestNet3 is used"` - SPVHostAdr string `long:"spvhostadr" description:"Address of full bitcoin node. It is used in SPV mode."` - NetParams *chaincfg.Params - BTCDCACert []byte + UseRegtest bool `long:"regtest" description:"Use RegNet. If not specified TestNet3 is used"` + SPVHostAdr string `long:"spvhostadr" description:"Address of full bitcoin node. It is used in SPV mode."` + NetParams *chaincfg.Params + BTCDCACert []byte } // loadConfig initializes and parses the config using a config file and command @@ -57,18 +58,18 @@ type config struct { // 4) Parse CLI options and overwrite/add any specified options func loadConfig() (*config, error) { defaultCfg := config{ - ConfigFile: defaultConfigFile, - DataDir: defaultDataDir, - PeerPort: defaultPeerPort, - RPCPort: defaultRPCPort, - SPVMode: defaultSPVMode, - BTCDHost: defaultBTCDHost, - BTCDUser: defaultBTCDUser, - BTCDPass: defaultBTCDPass, - BTCDNoTLS: defaultBTCDNoTLS, + ConfigFile: defaultConfigFile, + DataDir: defaultDataDir, + PeerPort: defaultPeerPort, + RPCPort: defaultRPCPort, + SPVMode: defaultSPVMode, + BTCDHost: defaultBTCDHost, + BTCDUser: defaultBTCDUser, + BTCDPass: defaultBTCDPass, + BTCDNoTLS: defaultBTCDNoTLS, BTCDCACertPath: defaultBTCDCACertPath, - UseRegtest: defaultUseRegtest, - SPVHostAdr: defaultSPVHostAdr, + UseRegtest: defaultUseRegtest, + SPVHostAdr: defaultSPVHostAdr, } preCfg := defaultCfg _, err := flags.Parse(&preCfg) @@ -81,21 +82,21 @@ func loadConfig() (*config, error) { return nil, err } _, err = flags.Parse(&cfg) -// Determine net parameters + // Determine net parameters if cfg.UseRegtest { cfg.NetParams = &chaincfg.RegressionNetParams } else { cfg.NetParams = &chaincfg.TestNet3Params } -// Read certificate if needed - if cfg.BTCDCACertPath!=""{ + // Read certificate if needed + if cfg.BTCDCACertPath != "" { f, err := os.Open(cfg.BTCDCACertPath) defer f.Close() - if err!=nil{ + if err != nil { return nil, err } cert, err := ioutil.ReadAll(f) - if err!=nil{ + if err != nil { return nil, err } cfg.BTCDCACert = cert