From e92bfcfd4ca6d44d23a54d5266b2d5236d0f0762 Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Tue, 10 Nov 2020 11:36:44 +0200
Subject: [PATCH] Removed err from function's signature of loadFromJsonCfg
 RPCCOnns

---
 config/rpcconn.go          | 10 ++++-----
 config/rpcconn_test.go     | 44 ++++++++++++++++++++++++++++++++------
 config/sessionscfg_test.go | 15 ++++++-------
 3 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/config/rpcconn.go b/config/rpcconn.go
index 9fd74e095..58d8a9ce7 100644
--- a/config/rpcconn.go
+++ b/config/rpcconn.go
@@ -42,7 +42,7 @@ type RPCConn struct {
 	Conns    []*RemoteHost
 }
 
-func (rC *RPCConn) loadFromJsonCfg(jsnCfg *RPCConnsJson) (err error) {
+func (rC *RPCConn) loadFromJsonCfg(jsnCfg *RPCConnsJson) {
 	if jsnCfg == nil {
 		return
 	}
@@ -56,7 +56,7 @@ func (rC *RPCConn) loadFromJsonCfg(jsnCfg *RPCConnsJson) (err error) {
 		rC.Conns = make([]*RemoteHost, len(*jsnCfg.Conns))
 		for idx, jsnHaCfg := range *jsnCfg.Conns {
 			rC.Conns[idx] = NewDfltRemoteHost()
-			rC.Conns[idx].loadFromJsonCfg(jsnHaCfg)
+			rC.Conns[idx].loadFromJsonCfg(jsnHaCfg) //To review if the function signature changes
 		}
 	}
 	return
@@ -95,9 +95,9 @@ type RemoteHost struct {
 	TLS         bool
 }
 
-func (self *RemoteHost) loadFromJsonCfg(jsnCfg *RemoteHostJson) error {
+func (self *RemoteHost) loadFromJsonCfg(jsnCfg *RemoteHostJson) {
 	if jsnCfg == nil {
-		return nil
+		return
 	}
 	if jsnCfg.Address != nil {
 		self.Address = *jsnCfg.Address
@@ -111,7 +111,7 @@ func (self *RemoteHost) loadFromJsonCfg(jsnCfg *RemoteHostJson) error {
 	if jsnCfg.Tls != nil {
 		self.TLS = *jsnCfg.Tls
 	}
-	return nil
+	return
 }
 
 func (rh *RemoteHost) AsMapInterface() map[string]interface{} {
diff --git a/config/rpcconn_test.go b/config/rpcconn_test.go
index e0eee91af..5a0645c06 100644
--- a/config/rpcconn_test.go
+++ b/config/rpcconn_test.go
@@ -66,19 +66,49 @@ func TestRPCConnsloadFromJsonCfgCase1(t *testing.T) {
 	}
 	if jsonCfg, err := NewDefaultCGRConfig(); err != nil {
 		t.Error(err)
-	} else if err = jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(cfgJSON); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(jsonCfg.rpcConns, expected) {
-		t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns))
+	} else {
+		jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(cfgJSON)
+		if !reflect.DeepEqual(jsonCfg.rpcConns, expected) {
+			t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns))
+		}
 	}
 }
 
 func TestRPCConnsloadFromJsonCfgCase2(t *testing.T) {
-	if jsonCfg, err := NewDefaultCGRConfig(); err != nil {
-		t.Error(err)
-	} else if err = jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(nil); err != nil {
+	expected := RpcConns{
+		utils.MetaInternal: {
+			Strategy: utils.MetaFirst,
+			PoolSize: 0,
+			Conns: []*RemoteHost{
+				{
+					Address:     utils.MetaInternal,
+					Transport:   utils.EmptyString,
+					Synchronous: false,
+					TLS:         false,
+				},
+			},
+		},
+		utils.MetaLocalHost: {
+			Strategy: utils.MetaFirst,
+			PoolSize: 0,
+			Conns: []*RemoteHost{
+				{
+					Address:     "127.0.0.1:2012",
+					Transport:   "*json",
+					Synchronous: false,
+					TLS:         false,
+				},
+			},
+		},
+	}
+	jsonCfg, err := NewDefaultCGRConfig()
+	if err != nil {
 		t.Error(err)
 	}
+	jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJsonCfg(nil)
+	if !reflect.DeepEqual(expected, jsonCfg.rpcConns) {
+		t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns))
+	}
 }
 
 func TestRPCConnsAsMapInterface(t *testing.T) {
diff --git a/config/sessionscfg_test.go b/config/sessionscfg_test.go
index b720d4da7..e9f300062 100644
--- a/config/sessionscfg_test.go
+++ b/config/sessionscfg_test.go
@@ -634,14 +634,12 @@ func TestFsConnCfgloadFromJsonCfg(t *testing.T) {
 
 func TestRemoteHostloadFromJsonCfg(t *testing.T) {
 	var hpoolcfg, expected RemoteHost
-	if err := hpoolcfg.loadFromJsonCfg(nil); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(hpoolcfg, expected) {
+	hpoolcfg.loadFromJsonCfg(nil)
+	if !reflect.DeepEqual(hpoolcfg, expected) {
 		t.Errorf("Expected: %+v ,received: %+v", expected, hpoolcfg)
 	}
-	if err := hpoolcfg.loadFromJsonCfg(new(RemoteHostJson)); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(hpoolcfg, expected) {
+	hpoolcfg.loadFromJsonCfg(new(RemoteHostJson))
+	if !reflect.DeepEqual(hpoolcfg, expected) {
 		t.Errorf("Expected: %+v ,received: %+v", expected, hpoolcfg)
 	}
 	json := &RemoteHostJson{
@@ -652,9 +650,8 @@ func TestRemoteHostloadFromJsonCfg(t *testing.T) {
 		Address:     "127.0.0.1:8448",
 		Synchronous: true,
 	}
-	if err = hpoolcfg.loadFromJsonCfg(json); err != nil {
-		t.Error(err)
-	} else if !reflect.DeepEqual(expected, hpoolcfg) {
+	hpoolcfg.loadFromJsonCfg(json)
+	if !reflect.DeepEqual(expected, hpoolcfg) {
 		t.Errorf("Expected: %+v , received: %+v", utils.ToJSON(expected), utils.ToJSON(hpoolcfg))
 	}
 }