From 5f91861550219ded87c4ca41f77275730596577f Mon Sep 17 00:00:00 2001
From: kompotkot <zenitsws@gmail.com>
Date: Mon, 8 Aug 2022 15:58:38 +0000
Subject: [PATCH] Fixes and todo in tests

---
 nodes/node_balancer/cmd/nodebalancer/clients.go      | 8 ++------
 nodes/node_balancer/cmd/nodebalancer/clients_test.go | 1 +
 nodes/node_balancer/cmd/nodebalancer/routes.go       | 6 +-----
 3 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/nodes/node_balancer/cmd/nodebalancer/clients.go b/nodes/node_balancer/cmd/nodebalancer/clients.go
index bd3607cf..f86c38f8 100644
--- a/nodes/node_balancer/cmd/nodebalancer/clients.go
+++ b/nodes/node_balancer/cmd/nodebalancer/clients.go
@@ -1,7 +1,6 @@
 package main
 
 import (
-	"errors"
 	"reflect"
 	"sync"
 	"time"
@@ -53,7 +52,7 @@ func CreateClientPools() {
 }
 
 // Return client pool corresponding to provided blockchain
-func GetClientPool(blockchain string) (*ClientPool, error) {
+func GetClientPool(blockchain string) *ClientPool {
 	var cpool *ClientPool
 	for b := range configBlockchains {
 		if b == blockchain {
@@ -61,10 +60,7 @@ func GetClientPool(blockchain string) (*ClientPool, error) {
 			cpool = &c
 		}
 	}
-	if len(cpool.Client) == 0 {
-		return nil, errors.New("Unsupported blockchain provided")
-	}
-	return cpool, nil
+	return cpool
 }
 
 // Updates client last appeal to node
diff --git a/nodes/node_balancer/cmd/nodebalancer/clients_test.go b/nodes/node_balancer/cmd/nodebalancer/clients_test.go
index c485ebf4..e8dfff18 100644
--- a/nodes/node_balancer/cmd/nodebalancer/clients_test.go
+++ b/nodes/node_balancer/cmd/nodebalancer/clients_test.go
@@ -1,3 +1,4 @@
+// TODO(kompotkot): Re-write tests for client
 package main
 
 import (
diff --git a/nodes/node_balancer/cmd/nodebalancer/routes.go b/nodes/node_balancer/cmd/nodebalancer/routes.go
index 087c434f..b9929369 100644
--- a/nodes/node_balancer/cmd/nodebalancer/routes.go
+++ b/nodes/node_balancer/cmd/nodebalancer/routes.go
@@ -55,11 +55,7 @@ func lbHandler(w http.ResponseWriter, r *http.Request) {
 
 	// Chose one node
 	var node *Node
-	cpool, err := GetClientPool(blockchain)
-	if err != nil {
-		http.Error(w, fmt.Sprintf("Unacceptable blockchain provided %s", blockchain), http.StatusBadRequest)
-		return
-	}
+	cpool := GetClientPool(blockchain)
 	node = cpool.GetClientNode(currentClientAccess.AccessID)
 	if node == nil {
 		node = blockchainPool.GetNextNode(blockchain)