build+routerrpc+lncli: remove routerrpc conditional compilation

Author: joostjager

.golangci.yml

@@ -17,7 +17,6 @@ run:
     - autopilotrpc
     - chainrpc
     - invoicesrpc
-    - routerrpc
     - signrpc
     - walletrpc
     - watchtowerrpc

Dockerfile

@@ -18,7 +18,7 @@ RUN apk add --no-cache --update alpine-sdk \
 &&  cd /go/src/github.com/lightningnetwork/lnd \
 &&  git checkout $checkout \
 &&  make \
-&&  make install tags="signrpc walletrpc chainrpc invoicesrpc routerrpc"
+&&  make install tags="signrpc walletrpc chainrpc invoicesrpc"
 
 # Start a new, final image.
 FROM alpine as final

build/release/release.sh

@@ -130,8 +130,8 @@ for i in $SYS; do
     cd $PACKAGE-$i-$TAG
 
     echo "Building:" $OS $ARCH $ARM
-    env CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH GOARM=$ARM go build -v -trimpath -ldflags="-s -w -buildid= $COMMITFLAGS" -tags="autopilotrpc signrpc walletrpc chainrpc invoicesrpc routerrpc watchtowerrpc" github.com/lightningnetwork/lnd/cmd/lnd
-    env CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH GOARM=$ARM go build -v -trimpath -ldflags="-s -w -buildid= $COMMITFLAGS" -tags="autopilotrpc invoicesrpc walletrpc routerrpc watchtowerrpc" github.com/lightningnetwork/lnd/cmd/lncli
+    env CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH GOARM=$ARM go build -v -trimpath -ldflags="-s -w -buildid= $COMMITFLAGS" -tags="autopilotrpc signrpc walletrpc chainrpc invoicesrpc watchtowerrpc" github.com/lightningnetwork/lnd/cmd/lnd
+    env CGO_ENABLED=0 GOOS=$OS GOARCH=$ARCH GOARM=$ARM go build -v -trimpath -ldflags="-s -w -buildid= $COMMITFLAGS" -tags="autopilotrpc invoicesrpc walletrpc watchtowerrpc" github.com/lightningnetwork/lnd/cmd/lncli
     cd ..
 
     if [[ $OS = "windows" ]]; then

cmd/lncli/cmd_build_route.go

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package main
 
 import (

cmd/lncli/cmd_query_mission_control.go

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package main
 
 import (

cmd/lncli/cmd_query_probability.go

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package main
 
 import (

cmd/lncli/cmd_reset_mission_control.go

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package main
 
 import (

cmd/lncli/routerrpc_active.go renamed to cmd/lncli/routerrpc.go

@@ -1,10 +1,8 @@
-// +build routerrpc
-
 package main
 
 import "github.com/urfave/cli"
 
-// routerCommands will return nil for non-routerrpc builds.
+// routerCommands returns a list of routerrpc commands.
 func routerCommands() []cli.Command {
 	return []cli.Command{
 		queryMissionControlCommand,

cmd/lncli/routerrpc_default.go

@@ -16,7 +16,7 @@ COPY . /go/src/github.com/lightningnetwork/lnd
 
 RUN cd /go/src/github.com/lightningnetwork/lnd \
 &&  make \
-&&  make install tags="signrpc walletrpc chainrpc invoicesrpc routerrpc"
+&&  make install tags="signrpc walletrpc chainrpc invoicesrpc"
 
 # Start a new, final image to reduce size.
 FROM alpine as final

docker/lnd/Dockerfile

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package routerrpc
 
 import (

lnrpc/routerrpc/config_active.go renamed to lnrpc/routerrpc/config.go

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package routerrpc
 
 import (

lnrpc/routerrpc/config_default.go

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package routerrpc
 
 import (

lnrpc/routerrpc/driver.go

@@ -1,5 +1,3 @@
-// +build routerrpc
-
 package routerrpc
 
 import (

lnrpc/routerrpc/router_server.go

@@ -61,6 +61,6 @@ backend = btcd
 endif
 
 # Construct the integration test command with the added build flags.
-ITEST_TAGS := $(DEV_TAGS) rpctest chainrpc walletrpc signrpc invoicesrpc autopilotrpc routerrpc watchtowerrpc $(backend)
+ITEST_TAGS := $(DEV_TAGS) rpctest chainrpc walletrpc signrpc invoicesrpc autopilotrpc watchtowerrpc $(backend)
 
 ITEST := rm lntest/itest/*.log; date; $(GOTEST) -v ./lntest/itest -tags="$(ITEST_TAGS)" $(TEST_FLAGS) -logoutput -goroutinedump

lnrpc/routerrpc/subscribe_events.go

@@ -53,14 +53,14 @@ Similar to lnd, subservers can be conditionally compiled with the build by
 setting the tags argument:
 
 ```
-make ios tags="routerrpc"
+make ios
 ```
 
 To support subservers that have APIs with name conflicts, pass the "prefix"
 flag. This will add the subserver name as a prefix to each method name:
 
 ```
-make ios tags="routerrpc" prefix=1
+make ios prefix=1
 ```
 
 ### API docs