Merge pull request #1926 from halseth/lnd-package

Move daemon from main to lnd package

Makefile

@@ -92,17 +92,17 @@ btcd:
 
 build:
 	@$(call print, "Building debug lnd and lncli.")
-	$(GOBUILD) -tags="$(DEV_TAGS)" -o lnd-debug $(LDFLAGS) $(PKG)
+	$(GOBUILD) -tags="$(DEV_TAGS)" -o lnd-debug $(LDFLAGS) $(PKG)/cmd/lnd
 	$(GOBUILD) -tags="$(DEV_TAGS)" -o lncli-debug $(LDFLAGS) $(PKG)/cmd/lncli
 
 build-itest:
 	@$(call print, "Building itest lnd and lncli.")
-	$(GOBUILD) -tags="$(ITEST_TAGS)" -o lnd-itest $(LDFLAGS) $(PKG)
+	$(GOBUILD) -tags="$(ITEST_TAGS)" -o lnd-itest $(LDFLAGS) $(PKG)/cmd/lnd
 	$(GOBUILD) -tags="$(ITEST_TAGS)" -o lncli-itest $(LDFLAGS) $(PKG)/cmd/lncli
 
 install:
 	@$(call print, "Installing lnd and lncli.")
-	$(GOINSTALL) -tags="${tags}" $(LDFLAGS) $(PKG)
+	$(GOINSTALL) -tags="${tags}" $(LDFLAGS) $(PKG)/cmd/lnd
 	$(GOINSTALL) -tags="${tags}" $(LDFLAGS) $(PKG)/cmd/lncli
 
 scratch: build

breacharbiter.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

breacharbiter_test.go

@@ -1,6 +1,6 @@
 // +build !rpctest
 
-package main
+package lnd
 
 import (
 	"bytes"

chainparams.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"github.com/btcsuite/btcd/chaincfg"

chainregistry.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"encoding/hex"

chancloser.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"fmt"

channel_notifier.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"fmt"

chanrestore.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"fmt"

cmd/lnd/main.go

@@ -0,0 +1,21 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	flags "github.com/jessevdk/go-flags"
+	"github.com/lightningnetwork/lnd"
+)
+
+func main() {
+	// Call the "real" main in a nested manner so the defers will properly
+	// be executed in the case of a graceful shutdown.
+	if err := lnd.Main(); err != nil {
+		if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrHelp {
+		} else {
+			fmt.Fprintln(os.Stderr, err)
+		}
+		os.Exit(1)
+	}
+}

config.go

@@ -2,7 +2,7 @@
 // Copyright (c) 2015-2016 The Decred developers
 // Copyright (C) 2015-2017 The Lightning Network Developers
 
-package main
+package lnd
 
 import (
 	"errors"

doc.go

@@ -1 +1 @@
-package main
+package lnd

fundingmanager.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

fundingmanager_test.go

@@ -1,6 +1,6 @@
 // +build !rpctest
 
-package main
+package lnd
 
 import (
 	"errors"

lnd.go

@@ -2,7 +2,7 @@
 // Copyright (c) 2015-2016 The Decred developers
 // Copyright (C) 2015-2017 The Lightning Network Developers
 
-package main
+package lnd
 
 import (
 	"bytes"
@@ -18,7 +18,6 @@ import (
 	"math/big"
 	"net"
 	"net/http"
-	_ "net/http/pprof"
 	"os"
 	"path/filepath"
 	"runtime/pprof"
@@ -26,6 +25,9 @@ import (
 	"sync"
 	"time"
 
+	// Blank import to set up profiling HTTP handlers.
+	_ "net/http/pprof"
+
 	"gopkg.in/macaroon-bakery.v2/bakery"
 
 	"golang.org/x/net/context"
@@ -36,7 +38,6 @@ import (
 	"github.com/btcsuite/btcd/btcec"
 	"github.com/btcsuite/btcwallet/wallet"
 	proxy "github.com/grpc-ecosystem/grpc-gateway/runtime"
-	flags "github.com/jessevdk/go-flags"
 	"github.com/lightninglabs/neutrino"
 
 	"github.com/lightningnetwork/lnd/autopilot"
@@ -89,10 +90,10 @@ var (
 	}
 )
 
-// lndMain is the true entry point for lnd. This function is required since
+// Main is the true entry point for lnd. This function is required since defers
-// defers created in the top-level scope of a main method aren't executed if
+// created in the top-level scope of a main method aren't executed if os.Exit()
-// os.Exit() is called.
+// is called.
-func lndMain() error {
+func Main() error {
 	// Load the configuration, and parse any command line options. This
 	// function will also set up logging properly.
 	loadedConfig, err := loadConfig()
@@ -468,18 +469,6 @@ func getTLSConfig(cfg *config) (*tls.Config, *credentials.TransportCredentials,
 	return tlsCfg, &restCreds, restProxyDest, nil
 }
 
-func main() {
-	// Call the "real" main in a nested manner so the defers will properly
-	// be executed in the case of a graceful shutdown.
-	if err := lndMain(); err != nil {
-		if e, ok := err.(*flags.Error); ok && e.Type == flags.ErrHelp {
-		} else {
-			fmt.Fprintln(os.Stderr, err)
-		}
-		os.Exit(1)
-	}
-}
-
 // fileExists reports whether the named file or directory exists.
 // This function is taken from https://github.com/btcsuite/btcd
 func fileExists(name string) bool {

lnd_test.go

@@ -1,6 +1,6 @@
 // +build rpctest
 
-package main
+package lnd
 
 import (
 	"bytes"

log.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"fmt"

mock.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"fmt"

nursery_store.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

nursery_store_test.go

@@ -1,6 +1,6 @@
 // +build !rpctest
 
-package main
+package lnd
 
 import (
 	"io/ioutil"

peer.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

peer_test.go

@@ -1,6 +1,6 @@
 // +build !rpctest
 
-package main
+package lnd
 
 import (
 	"testing"

pilot.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"errors"

rpcserver.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

server.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

server_test.go

@@ -1,6 +1,6 @@
 // +build !rpctest
 
-package main
+package lnd
 
 import "testing"
 

subrpcserver_config.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"fmt"

test_utils.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

utxonursery.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"bytes"

utxonursery_test.go

@@ -1,6 +1,6 @@
 // +build !rpctest
 
-package main
+package lnd
 
 import (
 	"bytes"

witness_beacon.go

@@ -1,4 +1,4 @@
-package main
+package lnd
 
 import (
 	"sync"