From a35604f81174d5ebb4b8d26e84622370b3ffd536 Mon Sep 17 00:00:00 2001
From: Leo <leo@certus.one>
Date: Sat, 21 Aug 2021 01:52:07 +0200
Subject: [PATCH] node/cmd: rename publicREST to publicWeb

Should be early enough to make this backwards-incompatible change.

Change-Id: I5ef119e286cac48839c7e20acd7b5efd0513ac78
---
 bridge/cmd/guardiand/bridge.go                     | 14 +++++++-------
 .../cmd/guardiand/{publicrest.go => publicweb.go}  |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)
 rename bridge/cmd/guardiand/{publicrest.go => publicweb.go} (96%)

diff --git a/bridge/cmd/guardiand/bridge.go b/bridge/cmd/guardiand/bridge.go
index 46e6e7cbf..be945e473 100644
--- a/bridge/cmd/guardiand/bridge.go
+++ b/bridge/cmd/guardiand/bridge.go
@@ -78,8 +78,8 @@ var (
 	devNumGuardians *uint
 	nodeName        *string
 
-	publicRPC  *string
-	publicREST *string
+	publicRPC *string
+	publicWeb *string
 
 	tlsHostname *string
 	tlsProdEnv  *bool
@@ -130,9 +130,9 @@ func init() {
 	nodeName = BridgeCmd.Flags().String("nodeName", "", "Node name to announce in gossip heartbeats")
 
 	publicRPC = BridgeCmd.Flags().String("publicRPC", "", "Listen address for public gRPC interface")
-	publicREST = BridgeCmd.Flags().String("publicREST", "", "Listen address for public REST and gRPC Web interface")
+	publicWeb = BridgeCmd.Flags().String("publicWeb", "", "Listen address for public REST and gRPC Web interface")
 
-	tlsHostname = BridgeCmd.Flags().String("tlsHostname", "", "If set, serve publicREST as TLS with this hostname using Let's Encrypt")
+	tlsHostname = BridgeCmd.Flags().String("tlsHostname", "", "If set, serve publicWeb as TLS with this hostname using Let's Encrypt")
 	tlsProdEnv = BridgeCmd.Flags().Bool("tlsProdEnv", false,
 		"Use the production Let's Encrypt environment instead of staging")
 
@@ -445,7 +445,7 @@ func runBridge(cmd *cobra.Command, args []string) {
 		logger.Fatal("failed to create admin service socket", zap.Error(err))
 	}
 
-	publicrestService, err := publicrestServiceRunnable(logger, *publicREST, *adminSocketPath, publicrpcServer,
+	publicwebService, err := publicwebServiceRunnable(logger, *publicWeb, *adminSocketPath, publicrpcServer,
 		*tlsHostname, *tlsProdEnv, path.Join(*dataDir, "autocert"))
 	if err != nil {
 		log.Fatal("failed to create publicrpc service socket", zap.Error(err))
@@ -513,8 +513,8 @@ func runBridge(cmd *cobra.Command, args []string) {
 				return err
 			}
 		}
-		if *publicREST != "" {
-			if err := supervisor.Run(ctx, "publicrest", publicrestService); err != nil {
+		if *publicWeb != "" {
+			if err := supervisor.Run(ctx, "publicweb", publicwebService); err != nil {
 				return err
 			}
 		}
diff --git a/bridge/cmd/guardiand/publicrest.go b/bridge/cmd/guardiand/publicweb.go
similarity index 96%
rename from bridge/cmd/guardiand/publicrest.go
rename to bridge/cmd/guardiand/publicweb.go
index dee2bcc55..64d31afe3 100644
--- a/bridge/cmd/guardiand/publicrest.go
+++ b/bridge/cmd/guardiand/publicweb.go
@@ -44,7 +44,7 @@ func corsPreflightHandler(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Access-Control-Allow-Methods", strings.Join(methods, ","))
 }
 
-func publicrestServiceRunnable(
+func publicwebServiceRunnable(
 	logger *zap.Logger,
 	listenAddr string,
 	upstreamAddr string,
@@ -112,7 +112,7 @@ func publicrestServiceRunnable(
 		supervisor.Signal(ctx, supervisor.SignalHealthy)
 		errC := make(chan error)
 		go func() {
-			logger.Info("publicrest server listening", zap.String("addr", srv.Addr))
+			logger.Info("publicweb server listening", zap.String("addr", srv.Addr))
 			if tlsHostname != "" {
 				errC <- srv.ListenAndServeTLS("", "")
 			} else {