remove reflection

config.go

@@ -221,7 +221,7 @@ type config struct {
 
 	Tor *torConfig `group:"Tor" namespace:"tor"`
 
-	SubRpcServers *subRpcServerConfigs `group:"subrpc"`
+	SignRPC *signrpc.Config `group:"subrpc"`
 
 	Hodl *hodl.Config `group:"hodl" namespace:"hodl"`
 
@@ -296,9 +296,7 @@ func loadConfig() (*config, error) {
 		},
 		MaxPendingChannels: defaultMaxPendingChannels,
 		NoSeedBackup:       defaultNoSeedBackup,
-		SubRpcServers: &subRpcServerConfigs{
-			SignRPC: &signrpc.Config{},
-		},
+		SignRPC:            &signrpc.Config{},
 		Autopilot: &autoPilotConfig{
 			MaxChannels:    5,
 			Allocation:     0.6,

lnd.go

@@ -315,7 +315,7 @@ func lndMain() error {
 	// Initialize, and register our implementation of the gRPC interface
 	// exported by the rpcServer.
 	rpcServer, err := newRPCServer(
-		server, macaroonService, cfg.SubRpcServers, serverOpts,
+		server, macaroonService, serverOpts,
 		proxyOpts, tlsConf,
 	)
 	if err != nil {

lnrpc/signrpc/config_active.go

@@ -31,3 +31,12 @@ type Config struct {
 	// the active signer instance.
 	Signer lnwallet.Signer
 }
+
+func (c *Config) Populate(sign lnwallet.Signer,
+	networkDir string, macService *macaroons.Service) *Config {
+
+	c.NetworkDir = networkDir
+	c.MacService = macService
+	c.Signer = sign
+	return c
+}

lnrpc/signrpc/config_default.go

@@ -2,5 +2,16 @@
 
 package signrpc
 
+import (
+	"github.com/lightningnetwork/lnd/lnwallet"
+	"github.com/lightningnetwork/lnd/macaroons"
+)
+
 // Config is empty for non-signrpc builds.
 type Config struct{}
+
+func (c *Config) Populate(sign lnwallet.Signer,
+	networkDir string, macService *macaroons.Service) *Config {
+	// Intentionally left empty.
+	return c
+}

lnrpc/signrpc/driver.go

@@ -12,24 +12,13 @@ import (
 // server given the main config dispatcher method. If we're unable to find the
 // config that is meant for us in the config dispatcher, then we'll exit with
 // an error.
-func createNewSubServer(configRegistry lnrpc.SubServerConfigDispatcher) (lnrpc.SubServer, lnrpc.MacaroonPerms, error) {
-	// We'll attempt to look up the config that we expect, according to our
-	// subServerName name. If we can't find this, then we'll exit with an
-	// error, as we're unable to properly initialize ourselves without this
-	// config.
-	signServerConf, ok := configRegistry.FetchConfig(subServerName)
-	if !ok {
-		return nil, nil, fmt.Errorf("unable to find config for "+
-			"subserver type %s", subServerName)
-	}
+func createNewSubServer(c interface{}) (lnrpc.SubServer, lnrpc.MacaroonPerms, error) {
 
-	// Now that we've found an object mapping to our service name, we'll
-	// ensure that it's the type we need.
-	config, ok := signServerConf.(*Config)
+	config, ok := c.(*Config)
 	if !ok {
 		return nil, nil, fmt.Errorf("wrong type of config for "+
-			"subserver %s, expected %T got %T", subServerName,
-			&Config{}, signServerConf)
+			"subserver %s, expected %T got %T", SubServerName,
+			&Config{}, c)
 	}
 
 	// Before we try to make the new signer service instance, we'll perform
@@ -51,8 +40,8 @@ func createNewSubServer(configRegistry lnrpc.SubServerConfigDispatcher) (lnrpc.S
 
 func init() {
 	subServer := &lnrpc.SubServerDriver{
-		SubServerName: subServerName,
-		New: func(c lnrpc.SubServerConfigDispatcher) (lnrpc.SubServer, lnrpc.MacaroonPerms, error) {
+		SubServerName: SubServerName,
+		New: func(c interface{}) (lnrpc.SubServer, lnrpc.MacaroonPerms, error) {
 			return createNewSubServer(c)
 		},
 	}
@@ -61,6 +50,6 @@ func init() {
 	// sub-RPC server within the global lnrpc package namespace.
 	if err := lnrpc.RegisterSubServer(subServer); err != nil {
 		panic(fmt.Sprintf("failed to register sub server driver '%s': %v",
-			subServerName, err))
+			SubServerName, err))
 	}
 }

lnrpc/signrpc/log.go

@@ -5,14 +5,21 @@ import (
 	"github.com/lightningnetwork/lnd/build"
 )
 
+const (
+	// subServerName is the name of the sub rpc server. We'll use this name
+	// to register ourselves, and we also require that the main
+	// SubServerConfigDispatcher instance recognize as the name of our
+	SubServerName = "SGNR"
+)
+
 // log is a logger that is initialized with no output filters.  This
 // means the package will not perform any logging by default until the caller
 // requests it.
 var log btclog.Logger
 
 // The default amount of logging is none.
 func init() {
-	UseLogger(build.NewSubLogger("SGNR", nil))
+	UseLogger(build.NewSubLogger(SubServerName, nil))
 }
 
 // DisableLog disables all library log output.  Logging output is disabled

lnrpc/signrpc/signer_server.go

@@ -21,13 +21,6 @@ import (
 	"gopkg.in/macaroon-bakery.v2/bakery"
 )
 
-const (
-	// subServerName is the name of the sub rpc server. We'll use this name
-	// to register ourselves, and we also require that the main
-	// SubServerConfigDispatcher instance recognize as the name of our
-	subServerName = "SignRPC"
-)
-
 var (
 	// macaroonOps are the set of capabilities that our minted macaroon (if
 	// it doesn't already exist) will have.
@@ -158,7 +151,7 @@ func (s *Server) Stop() error {
 //
 // NOTE: This is part of the lnrpc.SubServer interface.
 func (s *Server) Name() string {
-	return subServerName
+	return SubServerName
 }
 
 // RegisterWithRootServer will be called by the root gRPC server to direct a

lnrpc/sub_server.go

@@ -38,18 +38,6 @@ type SubServer interface {
 	RegisterWithRootServer(*grpc.Server) error
 }
 
-// SubServerConfigDispatcher is an interface that all sub-servers will use to
-// dynamically locate their configuration files. This abstraction will allow
-// the primary RPC sever to initialize all sub-servers in a generic manner
-// without knowing of each individual sub server.
-type SubServerConfigDispatcher interface {
-	// FetchConfig attempts to locate an existing configuration file mapped
-	// to the target sub-server. If we're unable to find a config file
-	// matching the subServerName name, then false will be returned for the
-	// second parameter.
-	FetchConfig(subServerName string) (interface{}, bool)
-}
-
 // SubServerDriver is a template struct that allows the root server to create a
 // sub-server with minimal knowledge. The root server only need a fully
 // populated SubServerConfigDispatcher and with the aide of the
@@ -66,7 +54,7 @@ type SubServerDriver struct {
 	// return the SubServer, ready for action, along with the set of
 	// macaroon permissions that the sub-server wishes to pass on to the
 	// root server for all methods routed towards it.
-	New func(subCfgs SubServerConfigDispatcher) (SubServer, MacaroonPerms, error)
+	New func(subCfgs interface{}) (SubServer, MacaroonPerms, error)
 }
 
 var (

rpcserver.go

@@ -32,6 +32,7 @@ import (
 	"github.com/lightningnetwork/lnd/htlcswitch"
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/lightningnetwork/lnd/lnrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/signrpc"
 	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/macaroons"
@@ -383,30 +384,32 @@ var _ lnrpc.LightningServer = (*rpcServer)(nil)
 // base level options passed to the grPC server. This typically includes things
 // like requiring TLS, etc.
 func newRPCServer(s *server, macService *macaroons.Service,
-	subServerCgs *subRpcServerConfigs, serverOpts []grpc.ServerOption,
+	serverOpts []grpc.ServerOption,
 	restServerOpts []grpc.DialOption,
 	tlsCfg *tls.Config) (*rpcServer, error) {
 
 	var (
 		subServers     []lnrpc.SubServer
 		subServerPerms []lnrpc.MacaroonPerms
+		subServerCfgs  = map[string]func() interface{}{
+			signrpc.SubServerName: func() interface{} {
+				return cfg.SignRPC.Populate(
+					s.cc.signer, networkDir, macService,
+				)
+			},
+		}
 	)
 
-	// Before we create any of the sub-servers, we need to ensure that all
-	// the dependencies they need are properly populated within each sub
-	// server configuration struct.
-	err := subServerCgs.PopulateDependancies(
-		s.cc, networkDir, macService,
-	)
-	if err != nil {
-		return nil, err
-	}
-
 	// Now that the sub-servers have all their dependencies in place, we
 	// can create each sub-server!
 	registeredSubServers := lnrpc.RegisteredSubServers()
 	for _, subServer := range registeredSubServers {
-		subServerInstance, macPerms, err := subServer.New(subServerCgs)
+		fetchCfg, ok := subServerCfgs[subServer.SubServerName]
+		if !ok {
+			return nil, fmt.Errorf("config not found")
+		}
+		cfg := fetchCfg()
+		subServerInstance, macPerms, err := subServer.New(cfg)
 		if err != nil {
 			return nil, err
 		}