From 7252e175dce8bd13791edbb209bfe0fb7a539342 Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Wed, 18 Sep 2019 17:22:20 -0700
Subject: [PATCH] lncli+wtclientrpc: remove wtclientrpc build tag, compile by
 default

---
 cmd/lncli/{wtclient_active.go => wtclient.go}     |  2 --
 cmd/lncli/wtclient_default.go                     | 10 ----------
 cmd/lncli/wtclient_types.go                       |  2 --
 lnrpc/wtclientrpc/{config_active.go => config.go} |  2 --
 lnrpc/wtclientrpc/config_default.go               |  6 ------
 5 files changed, 22 deletions(-)
 rename cmd/lncli/{wtclient_active.go => wtclient.go} (99%)
 delete mode 100644 cmd/lncli/wtclient_default.go
 rename lnrpc/wtclientrpc/{config_active.go => config.go} (97%)
 delete mode 100644 lnrpc/wtclientrpc/config_default.go

diff --git a/cmd/lncli/wtclient_active.go b/cmd/lncli/wtclient.go
similarity index 99%
rename from cmd/lncli/wtclient_active.go
rename to cmd/lncli/wtclient.go
index c58f3808..bcc0a4eb 100644
--- a/cmd/lncli/wtclient_active.go
+++ b/cmd/lncli/wtclient.go
@@ -1,5 +1,3 @@
-// +build wtclientrpc
-
 package main
 
 import (
diff --git a/cmd/lncli/wtclient_default.go b/cmd/lncli/wtclient_default.go
deleted file mode 100644
index d1e3c1dd..00000000
--- a/cmd/lncli/wtclient_default.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !wtclientrpc
-
-package main
-
-import "github.com/urfave/cli"
-
-// wtclientCommands will return nil for non-wtclientrpc builds.
-func wtclientCommands() []cli.Command {
-	return nil
-}
diff --git a/cmd/lncli/wtclient_types.go b/cmd/lncli/wtclient_types.go
index 7dcf5bf5..4192bef0 100644
--- a/cmd/lncli/wtclient_types.go
+++ b/cmd/lncli/wtclient_types.go
@@ -1,5 +1,3 @@
-// +build wtclientrpc
-
 package main
 
 import (
diff --git a/lnrpc/wtclientrpc/config_active.go b/lnrpc/wtclientrpc/config.go
similarity index 97%
rename from lnrpc/wtclientrpc/config_active.go
rename to lnrpc/wtclientrpc/config.go
index 7a50efef..a008ca0d 100644
--- a/lnrpc/wtclientrpc/config_active.go
+++ b/lnrpc/wtclientrpc/config.go
@@ -1,5 +1,3 @@
-// +build wtclientrpc
-
 package wtclientrpc
 
 import (
diff --git a/lnrpc/wtclientrpc/config_default.go b/lnrpc/wtclientrpc/config_default.go
deleted file mode 100644
index a23813cb..00000000
--- a/lnrpc/wtclientrpc/config_default.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build !wtclientrpc
-
-package wtclientrpc
-
-// Config is empty for non-wtclientrpc builds.
-type Config struct{}