From 74376ea9ee5404501129fa9403983bfe1f60e686 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Sieczkowski?= <michal@ethworks.io>
Date: Fri, 2 Jul 2021 16:32:44 +0200
Subject: [PATCH] Rename and fix bootstrap node url env var (#234)

* Rename bootstrap node url env var and fix it in test config

* Remove redundant comment
---
 config.example.yaml                                           | 2 +-
 config/config.go                                              | 4 ++--
 deployment/staging/hubble-commander/secondary-config-map.yaml | 2 +-
 main/main.go                                                  | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/config.example.yaml b/config.example.yaml
index 30aeada8d..0f0112a64 100644
--- a/config.example.yaml
+++ b/config.example.yaml
@@ -3,7 +3,7 @@
 #  format: text
 #
 #bootstrap:
-#  bootstrap_node_url: http://localhost:8080   # set this url to bootstrap from remote node
+#  node_url: http://localhost:8080   # set this url to bootstrap from remote node
 #
 #rollup:
 #  sync_size: 50
diff --git a/config/config.go b/config/config.go
index 4eeed6384..28d91195e 100644
--- a/config/config.go
+++ b/config/config.go
@@ -35,7 +35,7 @@ func GetConfig() *Config {
 		Bootstrap: &BootstrapConfig{
 			Prune:            false, // overridden in main
 			GenesisAccounts:  getGenesisAccounts(),
-			BootstrapNodeURL: getStringOrNil("bootstrap.bootstrap_node_url"),
+			BootstrapNodeURL: getStringOrNil("bootstrap.node_url"),
 		},
 		Rollup: &RollupConfig{
 			SyncSize:               getUint32("rollup.sync_size", 50),
@@ -74,7 +74,7 @@ func GetTestConfig() *Config {
 		Bootstrap: &BootstrapConfig{
 			Prune:            false, // overridden in main
 			GenesisAccounts:  getGenesisAccounts(),
-			BootstrapNodeURL: getStringOrNil("rollup.bootstrap_node_url"),
+			BootstrapNodeURL: getStringOrNil("bootstrap.node_url"),
 		},
 		Rollup: &RollupConfig{
 			SyncSize:               getUint32("rollup.sync_size", 50),
diff --git a/deployment/staging/hubble-commander/secondary-config-map.yaml b/deployment/staging/hubble-commander/secondary-config-map.yaml
index bd5a59fd4..cd8403698 100644
--- a/deployment/staging/hubble-commander/secondary-config-map.yaml
+++ b/deployment/staging/hubble-commander/secondary-config-map.yaml
@@ -8,5 +8,5 @@ metadata:
 data:
   HUBBLE_ETHEREUM_PRIVATE_KEY: ab6919fd6ac00246bb78657e0696cf72058a4cb395133d074eabaddb83d8b00c
   HUBBLE_POSTGRES_NAME: "secondary-hubble-commander"
-  HUBBLE_BOOTSTRAP_BOOTSTRAP_NODE_URL: http://localhost:8080
+  HUBBLE_BOOTSTRAP_NODE_URL: http://localhost:8080
   HUBBLE_API_PORT: "8081"
diff --git a/main/main.go b/main/main.go
index a17bbbbca..ed273c370 100644
--- a/main/main.go
+++ b/main/main.go
@@ -50,7 +50,6 @@ func configureLogger(cfg *config.Config) {
 	}
 
 	// Output to stdout instead of the default stderr
-	// Can be any io.Writer, see below for File example
 	log.SetOutput(os.Stdout)
 
 	// Only log the warning severity or above.