From 4c7111256ebce7a928db3ee345eb0262efed593a Mon Sep 17 00:00:00 2001
From: Conner Fromknecht <conner@lightning.engineering>
Date: Fri, 8 Feb 2019 20:02:05 -0800
Subject: [PATCH] watchtower/wtwire/features: remove local/global feature
 names...

in favor of a universal FeatureNames index.
---
 watchtower/wtserver/server.go |  2 +-
 watchtower/wtwire/features.go | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/watchtower/wtserver/server.go b/watchtower/wtserver/server.go
index 81b8b5fe9..4518ad6f7 100644
--- a/watchtower/wtserver/server.go
+++ b/watchtower/wtserver/server.go
@@ -306,7 +306,7 @@ func (s *Server) handleInit(localInit, remoteInit *wtwire.Init) error {
 	}
 
 	remoteConnFeatures := lnwire.NewFeatureVector(
-		remoteInit.ConnFeatures, wtwire.LocalFeatures,
+		remoteInit.ConnFeatures, wtwire.FeatureNames,
 	)
 
 	unknownLocalFeatures := remoteConnFeatures.UnknownRequiredFeatures()
diff --git a/watchtower/wtwire/features.go b/watchtower/wtwire/features.go
index 07c3eb7fe..e407c96e2 100644
--- a/watchtower/wtwire/features.go
+++ b/watchtower/wtwire/features.go
@@ -2,13 +2,9 @@ package wtwire
 
 import "github.com/lightningnetwork/lnd/lnwire"
 
-// GlobalFeatures holds the globally advertised feature bits understood by
-// watchtower implementations.
-var GlobalFeatures map[lnwire.FeatureBit]string
-
-// LocalFeatures holds the locally advertised feature bits understood by
-// watchtower implementations.
-var LocalFeatures = map[lnwire.FeatureBit]string{
+// FeatureNames holds a mapping from each feature bit understood by this
+// implementation to its common name.
+var FeatureNames = map[lnwire.FeatureBit]string{
 	WtSessionsRequired: "wt-sessions",
 	WtSessionsOptional: "wt-sessions",
 }