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 }