From cc0b25bf03f2b349ff062d388341e3d9b80d94d1 Mon Sep 17 00:00:00 2001
From: kompotkot <zenitsws@gmail.com>
Date: Mon, 11 Jul 2022 14:01:10 +0000
Subject: [PATCH] Updated structure

---
 nodes/.gitignore                                         | 1 -
 nodes/deploy/deploy.bash                                 | 2 +-
 nodes/node_balancer/cmd/{ => nodebalancer}/balancer.go   | 2 +-
 nodes/node_balancer/cmd/{ => nodebalancer}/blockchain.go | 2 +-
 nodes/node_balancer/cmd/{ => nodebalancer}/cli.go        | 3 +--
 nodes/node_balancer/cmd/{ => nodebalancer}/clients.go    | 4 ++--
 .../node_balancer/cmd/{ => nodebalancer}/clients_test.go | 2 +-
 nodes/node_balancer/cmd/{ => nodebalancer}/db.go         | 2 +-
 nodes/node_balancer/cmd/nodebalancer/main.go             | 5 +++++
 nodes/node_balancer/cmd/{ => nodebalancer}/middleware.go | 2 +-
 nodes/node_balancer/cmd/{ => nodebalancer}/routes.go     | 2 +-
 nodes/node_balancer/cmd/{ => nodebalancer}/server.go     | 2 +-
 nodes/node_balancer/dev.sh                               | 2 +-
 nodes/node_balancer/main.go                              | 9 ---------
 14 files changed, 17 insertions(+), 23 deletions(-)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/balancer.go (99%)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/blockchain.go (99%)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/cli.go (99%)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/clients.go (99%)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/clients_test.go (99%)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/db.go (99%)
 create mode 100644 nodes/node_balancer/cmd/nodebalancer/main.go
 rename nodes/node_balancer/cmd/{ => nodebalancer}/middleware.go (99%)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/routes.go (99%)
 rename nodes/node_balancer/cmd/{ => nodebalancer}/server.go (99%)
 delete mode 100644 nodes/node_balancer/main.go

diff --git a/nodes/.gitignore b/nodes/.gitignore
index 70a1c8af..342fca88 100644
--- a/nodes/.gitignore
+++ b/nodes/.gitignore
@@ -61,5 +61,4 @@ go.work
 dev.env
 prod.env
 test.env
-nodebalancer
 
diff --git a/nodes/deploy/deploy.bash b/nodes/deploy/deploy.bash
index 8f21a619..a81524e4 100755
--- a/nodes/deploy/deploy.bash
+++ b/nodes/deploy/deploy.bash
@@ -58,7 +58,7 @@ echo
 echo -e "${PREFIX_INFO} Building executable load balancer for nodes script with Go"
 EXEC_DIR=$(pwd)
 cd "${APP_NODES_DIR}/node_balancer"
-HOME=/root /usr/local/go/bin/go build -o "${APP_NODES_DIR}/node_balancer/nodebalancer" "${APP_NODES_DIR}/node_balancer/main.go"
+HOME=/root /usr/local/go/bin/go build -o "${APP_NODES_DIR}/node_balancer/nodebalancer" "${APP_NODES_DIR}/node_balancer/cmd/nodebalancer/*.go"
 cd "${EXEC_DIR}"
 
 echo
diff --git a/nodes/node_balancer/cmd/balancer.go b/nodes/node_balancer/cmd/nodebalancer/balancer.go
similarity index 99%
rename from nodes/node_balancer/cmd/balancer.go
rename to nodes/node_balancer/cmd/nodebalancer/balancer.go
index f384d7d2..17b6daf9 100644
--- a/nodes/node_balancer/cmd/balancer.go
+++ b/nodes/node_balancer/cmd/nodebalancer/balancer.go
@@ -1,7 +1,7 @@
 /*
 Load balancer, based on https://github.com/kasvith/simplelb/
 */
-package cmd
+package main
 
 import (
 	"encoding/json"
diff --git a/nodes/node_balancer/cmd/blockchain.go b/nodes/node_balancer/cmd/nodebalancer/blockchain.go
similarity index 99%
rename from nodes/node_balancer/cmd/blockchain.go
rename to nodes/node_balancer/cmd/nodebalancer/blockchain.go
index f64f3e7b..4711ca28 100644
--- a/nodes/node_balancer/cmd/blockchain.go
+++ b/nodes/node_balancer/cmd/nodebalancer/blockchain.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"io/ioutil"
diff --git a/nodes/node_balancer/cmd/cli.go b/nodes/node_balancer/cmd/nodebalancer/cli.go
similarity index 99%
rename from nodes/node_balancer/cmd/cli.go
rename to nodes/node_balancer/cmd/nodebalancer/cli.go
index bd9fbe80..2a5bfe4b 100644
--- a/nodes/node_balancer/cmd/cli.go
+++ b/nodes/node_balancer/cmd/nodebalancer/cli.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"encoding/json"
@@ -139,7 +139,6 @@ func (s *StateCLI) checkRequirements() {
 	}
 
 	config := configs.GetConfigPath(s.configPathFlag)
-	fmt.Println(config)
 	if !configs.CheckPathExists(config.ConfigPath) {
 		configs.GenerateDefaultConfig(config)
 	}
diff --git a/nodes/node_balancer/cmd/clients.go b/nodes/node_balancer/cmd/nodebalancer/clients.go
similarity index 99%
rename from nodes/node_balancer/cmd/clients.go
rename to nodes/node_balancer/cmd/nodebalancer/clients.go
index 5195cdc7..94ea3331 100644
--- a/nodes/node_balancer/cmd/clients.go
+++ b/nodes/node_balancer/cmd/nodebalancer/clients.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"errors"
@@ -23,7 +23,7 @@ type ClientResourceData struct {
 	Description      string `json:"description"`
 	BlockchainAccess bool   `json:"blockchain_access"`
 	ExtendedMethods  bool   `json:"extended_methods"`
-	
+
 	LastAccessTs int64 `json:"last_access_ts"`
 
 	dataSource string
diff --git a/nodes/node_balancer/cmd/clients_test.go b/nodes/node_balancer/cmd/nodebalancer/clients_test.go
similarity index 99%
rename from nodes/node_balancer/cmd/clients_test.go
rename to nodes/node_balancer/cmd/nodebalancer/clients_test.go
index bcdb0947..41a4d52d 100644
--- a/nodes/node_balancer/cmd/clients_test.go
+++ b/nodes/node_balancer/cmd/nodebalancer/clients_test.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"reflect"
diff --git a/nodes/node_balancer/cmd/db.go b/nodes/node_balancer/cmd/nodebalancer/db.go
similarity index 99%
rename from nodes/node_balancer/cmd/db.go
rename to nodes/node_balancer/cmd/nodebalancer/db.go
index e31b9d24..4ce99884 100644
--- a/nodes/node_balancer/cmd/db.go
+++ b/nodes/node_balancer/cmd/nodebalancer/db.go
@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"database/sql"
diff --git a/nodes/node_balancer/cmd/nodebalancer/main.go b/nodes/node_balancer/cmd/nodebalancer/main.go
new file mode 100644
index 00000000..f39b62eb
--- /dev/null
+++ b/nodes/node_balancer/cmd/nodebalancer/main.go
@@ -0,0 +1,5 @@
+package main
+
+func main() {
+	CLI()
+}
diff --git a/nodes/node_balancer/cmd/middleware.go b/nodes/node_balancer/cmd/nodebalancer/middleware.go
similarity index 99%
rename from nodes/node_balancer/cmd/middleware.go
rename to nodes/node_balancer/cmd/nodebalancer/middleware.go
index 5cffc9c1..5e33bade 100644
--- a/nodes/node_balancer/cmd/middleware.go
+++ b/nodes/node_balancer/cmd/nodebalancer/middleware.go
@@ -1,7 +1,7 @@
 /*
 Server API middleware.
 */
-package cmd
+package main
 
 import (
 	"bytes"
diff --git a/nodes/node_balancer/cmd/routes.go b/nodes/node_balancer/cmd/nodebalancer/routes.go
similarity index 99%
rename from nodes/node_balancer/cmd/routes.go
rename to nodes/node_balancer/cmd/nodebalancer/routes.go
index 36559915..c1deb560 100644
--- a/nodes/node_balancer/cmd/routes.go
+++ b/nodes/node_balancer/cmd/nodebalancer/routes.go
@@ -1,7 +1,7 @@
 /*
 Handle routes for load balancer API.
 */
-package cmd
+package main
 
 import (
 	"bytes"
diff --git a/nodes/node_balancer/cmd/server.go b/nodes/node_balancer/cmd/nodebalancer/server.go
similarity index 99%
rename from nodes/node_balancer/cmd/server.go
rename to nodes/node_balancer/cmd/nodebalancer/server.go
index d265ce6b..9869d72a 100644
--- a/nodes/node_balancer/cmd/server.go
+++ b/nodes/node_balancer/cmd/nodebalancer/server.go
@@ -1,7 +1,7 @@
 /*
 Node load balancer API server initialization.
 */
-package cmd
+package main
 
 import (
 	"context"
diff --git a/nodes/node_balancer/dev.sh b/nodes/node_balancer/dev.sh
index c8719f22..25a1a896 100755
--- a/nodes/node_balancer/dev.sh
+++ b/nodes/node_balancer/dev.sh
@@ -5,6 +5,6 @@ set -e
 
 PROGRAM_NAME="nodebalancer"
 
-go build -o "$PROGRAM_NAME" .
+go build -o "$PROGRAM_NAME" cmd/nodebalancer/*.go
 
 ./"$PROGRAM_NAME" "$@"
diff --git a/nodes/node_balancer/main.go b/nodes/node_balancer/main.go
deleted file mode 100644
index 91a1764c..00000000
--- a/nodes/node_balancer/main.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package main
-
-import (
-	"github.com/bugout-dev/moonstream/nodes/node_balancer/cmd"
-)
-
-func main() {
-	cmd.CLI()
-}