From 767c4f2298203c3f941007e420e45c71c596fbe6 Mon Sep 17 00:00:00 2001
From: Joost Jager <joost.jager@gmail.com>
Date: Mon, 30 Mar 2020 11:09:17 +0200
Subject: [PATCH] routerrpc: remove reflection-based initialization

---
 subrpcserver_config.go | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/subrpcserver_config.go b/subrpcserver_config.go
index 31e8220b..48559118 100644
--- a/subrpcserver_config.go
+++ b/subrpcserver_config.go
@@ -219,21 +219,9 @@ func (s *subRPCServerConfigs) PopulateDependencies(cc *chainControl,
 				reflect.ValueOf(genInvoiceFeatures),
 			)
 
+		// RouterRPC isn't conditionally compiled and doesn't need to be
+		// populated using reflection.
 		case *routerrpc.Config:
-			subCfgValue := extractReflectValue(subCfg)
-
-			subCfgValue.FieldByName("NetworkDir").Set(
-				reflect.ValueOf(networkDir),
-			)
-			subCfgValue.FieldByName("MacService").Set(
-				reflect.ValueOf(macService),
-			)
-			subCfgValue.FieldByName("Router").Set(
-				reflect.ValueOf(chanRouter),
-			)
-			subCfgValue.FieldByName("RouterBackend").Set(
-				reflect.ValueOf(routerBackend),
-			)
 
 		case *watchtowerrpc.Config:
 			subCfgValue := extractReflectValue(subCfg)
@@ -266,6 +254,12 @@ func (s *subRPCServerConfigs) PopulateDependencies(cc *chainControl,
 		}
 	}
 
+	// Populate routerrpc dependencies.
+	s.RouterRPC.NetworkDir = networkDir
+	s.RouterRPC.MacService = macService
+	s.RouterRPC.Router = chanRouter
+	s.RouterRPC.RouterBackend = routerBackend
+
 	return nil
 }