diff --git a/engine/libtest.go b/engine/libtest.go index d9adc2e05..074354c76 100644 --- a/engine/libtest.go +++ b/engine/libtest.go @@ -349,7 +349,7 @@ func LoadAllDataDBToCache(dm *DataManager) (err error) { return } -func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) { +func NewRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) { switch *utils.Encoding { case utils.MetaJSON: return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen) @@ -408,7 +408,7 @@ func (ng TestEngine) Run(t *testing.T) (*birpc.Client, *config.CGRConfig) { startEngine(t, cfg, ng.LogBuffer) - client, err := newRPCClient(cfg.ListenCfg()) + client, err := NewRPCClient(cfg.ListenCfg()) if err != nil { t.Fatalf("could not connect to cgr-engine: %v", err) } diff --git a/engine/z_actions2_it_test.go b/engine/z_actions2_it_test.go index 345f173ff..d38a7d174 100644 --- a/engine/z_actions2_it_test.go +++ b/engine/z_actions2_it_test.go @@ -134,7 +134,7 @@ func testActionsStartEngine(t *testing.T) { // Connect rpc client to rater func testActionsRPCConn(t *testing.T) { var err error - actsRPC, err = newRPCClient(actsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + actsRPC, err = NewRPCClient(actsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/engine/z_actions_it_test.go b/engine/z_actions_it_test.go index b37f13654..89edae0dd 100644 --- a/engine/z_actions_it_test.go +++ b/engine/z_actions_it_test.go @@ -116,7 +116,7 @@ func testActionsitStartEngine(t *testing.T) { func testActionsitRpcConn(t *testing.T) { var err error // time.Sleep(500 * time.Millisecond) - actsLclRpc, err = newRPCClient(actsLclCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + actsLclRpc, err = NewRPCClient(actsLclCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/a1_it_test.go b/general_tests/a1_it_test.go index acb15ef52..f6efa19f4 100644 --- a/general_tests/a1_it_test.go +++ b/general_tests/a1_it_test.go @@ -105,7 +105,7 @@ func testA1itStartEngine(t *testing.T) { func testA1itRPCConn(t *testing.T) { var err error - a1rpc, err = newRPCClient(a1Cfg.ListenCfg()) + a1rpc, err = engine.NewRPCClient(a1Cfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/accounts_it_test.go b/general_tests/accounts_it_test.go index f5242354a..7c9b62038 100644 --- a/general_tests/accounts_it_test.go +++ b/general_tests/accounts_it_test.go @@ -111,7 +111,7 @@ func testV1AccStartEngine(t *testing.T) { func testV1AccRpcConn(t *testing.T) { var err error - accRpc, err = newRPCClient(accCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + accRpc, err = engine.NewRPCClient(accCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/accountswiththresholds_it_test.go b/general_tests/accountswiththresholds_it_test.go index 89a532e09..0907b5f11 100644 --- a/general_tests/accountswiththresholds_it_test.go +++ b/general_tests/accountswiththresholds_it_test.go @@ -108,7 +108,7 @@ func testAccWThdStartEngine(t *testing.T) { func testAccWThdRpcConn(t *testing.T) { var err error - accWThdRpc, err = newRPCClient(accWThdCfg.ListenCfg()) // We connect over JSON so we can troubleshoot if needed + accWThdRpc, err = engine.NewRPCClient(accWThdCfg.ListenCfg()) // We connect over JSON so we can troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/all_cfg_sect_rld_it_test.go b/general_tests/all_cfg_sect_rld_it_test.go index 801f6b596..e7b2da385 100644 --- a/general_tests/all_cfg_sect_rld_it_test.go +++ b/general_tests/all_cfg_sect_rld_it_test.go @@ -150,7 +150,7 @@ func testSectStartEngine(t *testing.T) { func testSectRPCConn(t *testing.T) { var err error - testSectRPC, err = newRPCClient(testSectCfg.ListenCfg()) + testSectRPC, err = engine.NewRPCClient(testSectCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/attributes_filters_index_it_test.go b/general_tests/attributes_filters_index_it_test.go index b29758447..fc5443dce 100644 --- a/general_tests/attributes_filters_index_it_test.go +++ b/general_tests/attributes_filters_index_it_test.go @@ -105,7 +105,7 @@ func testAttributeFltrSStartEngine(t *testing.T) { // Connect rpc client to rater func testAttributeFltrSRPCConn(t *testing.T) { var err error - attrFltrRPC, err = newRPCClient(attrFltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + attrFltrRPC, err = engine.NewRPCClient(attrFltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index c66aadc44..5479565a7 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -112,7 +112,7 @@ func testAttributeSStartEngine(t *testing.T) { // Connect rpc client to rater func testAttributeSRPCConn(t *testing.T) { var err error - attrRPC, err = newRPCClient(attrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + attrRPC, err = engine.NewRPCClient(attrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/attributeswithdataconverters_it_test.go b/general_tests/attributeswithdataconverters_it_test.go index 6a93e9e41..0abdd0759 100644 --- a/general_tests/attributeswithdataconverters_it_test.go +++ b/general_tests/attributeswithdataconverters_it_test.go @@ -103,7 +103,7 @@ func testAttrWDcStartEngine(t *testing.T) { func testAttrWDcRPCConn(t *testing.T) { var err error - attrWDcRpc, err = newRPCClient(attrWDcCfg.ListenCfg()) + attrWDcRpc, err = engine.NewRPCClient(attrWDcCfg.ListenCfg()) if err != nil { t.Error(err) } diff --git a/general_tests/broadcast_client_it_test.go b/general_tests/broadcast_client_it_test.go index b04b98216..57cf0365b 100644 --- a/general_tests/broadcast_client_it_test.go +++ b/general_tests/broadcast_client_it_test.go @@ -112,11 +112,11 @@ func testbrodcastItStartEngine(t *testing.T) { func testbrodcastItRPCConn(t *testing.T) { var err error - brodcastRPC, err = newRPCClient(brodcastCfg.ListenCfg()) + brodcastRPC, err = engine.NewRPCClient(brodcastCfg.ListenCfg()) if err != nil { t.Fatal(err) } - brodcastInternalRPC, err = newRPCClient(brodcastInternalCfg.ListenCfg()) + brodcastInternalRPC, err = engine.NewRPCClient(brodcastInternalCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/cacherpl_filter_update_it_test.go b/general_tests/cacherpl_filter_update_it_test.go index ffdf6b1e0..be03885ce 100644 --- a/general_tests/cacherpl_filter_update_it_test.go +++ b/general_tests/cacherpl_filter_update_it_test.go @@ -139,10 +139,10 @@ func testFilterUpdateStartEngine(t *testing.T) { // Connect rpc client to rater func testFilterUpdateRpcConn(t *testing.T) { var err error - if fltrUpdateRPC1, err = newRPCClient(fltrUpdateCfg1.ListenCfg()); err != nil { + if fltrUpdateRPC1, err = engine.NewRPCClient(fltrUpdateCfg1.ListenCfg()); err != nil { t.Fatal(err) } - if fltrUpdateRPC2, err = newRPCClient(fltrUpdateCfg2.ListenCfg()); err != nil { + if fltrUpdateRPC2, err = engine.NewRPCClient(fltrUpdateCfg2.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/cacherpl_it_test.go b/general_tests/cacherpl_it_test.go index c4b296a6d..dd999f9b5 100644 --- a/general_tests/cacherpl_it_test.go +++ b/general_tests/cacherpl_it_test.go @@ -175,15 +175,15 @@ func testCacheRplStartEngine(t *testing.T) { func testCacheRplRpcConn(t *testing.T) { var err error - dspEngine1RPC, err = newRPCClient(dspEngine1Cfg.ListenCfg()) + dspEngine1RPC, err = engine.NewRPCClient(dspEngine1Cfg.ListenCfg()) if err != nil { t.Fatal(err) } - dspEngine2RPC, err = newRPCClient(dspEngine2Cfg.ListenCfg()) + dspEngine2RPC, err = engine.NewRPCClient(dspEngine2Cfg.ListenCfg()) if err != nil { t.Fatal(err) } - engine1RPC, err = newRPCClient(engine1Cfg.ListenCfg()) + engine1RPC, err = engine.NewRPCClient(engine1Cfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/cdrs_exp_it_test.go b/general_tests/cdrs_exp_it_test.go index 6e0a782a5..f7e55a9f1 100644 --- a/general_tests/cdrs_exp_it_test.go +++ b/general_tests/cdrs_exp_it_test.go @@ -215,7 +215,7 @@ func testCDRsExpStartEngine(t *testing.T) { func testCDRsExpInitRPC(t *testing.T) { var err error - if cdrsExpRPC, err = newRPCClient(cdrsExpCfg.ListenCfg()); err != nil { + if cdrsExpRPC, err = engine.NewRPCClient(cdrsExpCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/cdrs_internal_it_test.go b/general_tests/cdrs_internal_it_test.go index fb5b7fbc9..bc13aaa33 100644 --- a/general_tests/cdrs_internal_it_test.go +++ b/general_tests/cdrs_internal_it_test.go @@ -87,7 +87,7 @@ func testCdrsIntStartEngine(t *testing.T) { func testCdrsIntRpcConn(t *testing.T) { var err error - cdrsIntRPC, err = newRPCClient(cdrsIntCfg.ListenCfg()) + cdrsIntRPC, err = engine.NewRPCClient(cdrsIntCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/cdrs_it_test.go b/general_tests/cdrs_it_test.go index 9f526cf92..32d0994a1 100644 --- a/general_tests/cdrs_it_test.go +++ b/general_tests/cdrs_it_test.go @@ -131,7 +131,7 @@ func testV2CDRsStartEngine(t *testing.T) { // Connect rpc client to rater func testV2CDRsRpcConn(t *testing.T) { var err error - cdrsRpc, err = newRPCClient(cdrsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + cdrsRpc, err = engine.NewRPCClient(cdrsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/cdrs_post_failover_it_test.go b/general_tests/cdrs_post_failover_it_test.go index a1b341446..3f9b03bed 100644 --- a/general_tests/cdrs_post_failover_it_test.go +++ b/general_tests/cdrs_post_failover_it_test.go @@ -111,7 +111,7 @@ func testCDRsPostFailoverStartEngine(t *testing.T) { // Connect rpc client to rater func testCDRsPostFailoverRpcConn(t *testing.T) { var err error - cdrsPostFailRpc, err = newRPCClient(cdrsPostFailCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + cdrsPostFailRpc, err = engine.NewRPCClient(cdrsPostFailCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/cdrs_processevent_it_test.go b/general_tests/cdrs_processevent_it_test.go index e017f1223..d8cb76af9 100644 --- a/general_tests/cdrs_processevent_it_test.go +++ b/general_tests/cdrs_processevent_it_test.go @@ -121,7 +121,7 @@ func testV1CDRsStartEngine(t *testing.T) { func testV1CDRsRpcConn(t *testing.T) { var err error - pecdrsRpc, err = newRPCClient(pecdrsCfg.ListenCfg()) + pecdrsRpc, err = engine.NewRPCClient(pecdrsCfg.ListenCfg()) if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/cgrloader_it_test.go b/general_tests/cgrloader_it_test.go index ab642c621..d42ea2694 100644 --- a/general_tests/cgrloader_it_test.go +++ b/general_tests/cgrloader_it_test.go @@ -104,7 +104,7 @@ func testCGRLoaderStartEngine(t *testing.T) { func testCGRLoaderRpcConn(t *testing.T) { var err error - cgrloaderRPC, err = newRPCClient(cgrloaderCfg.ListenCfg()) + cgrloaderRPC, err = engine.NewRPCClient(cgrloaderCfg.ListenCfg()) if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/data_it_test.go b/general_tests/data_it_test.go index 938059bef..80db3dd6e 100644 --- a/general_tests/data_it_test.go +++ b/general_tests/data_it_test.go @@ -109,7 +109,7 @@ func testV1DataStartEngine(t *testing.T) { func testV1DataRpcConn(t *testing.T) { var err error - dataRpc, err = newRPCClient(dataCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + dataRpc, err = engine.NewRPCClient(dataCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/destination_combined_it_test.go b/general_tests/destination_combined_it_test.go index a59bf3fb5..f0670d42a 100644 --- a/general_tests/destination_combined_it_test.go +++ b/general_tests/destination_combined_it_test.go @@ -93,7 +93,7 @@ func testDestinationStartEngine(t *testing.T) { func testDestinationRpcConn(t *testing.T) { var err error - tutorialRpc, err = newRPCClient(tutorialCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + tutorialRpc, err = engine.NewRPCClient(tutorialCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/doubleremove_it_test.go b/general_tests/doubleremove_it_test.go index 6b78e40cf..eb65c1916 100644 --- a/general_tests/doubleremove_it_test.go +++ b/general_tests/doubleremove_it_test.go @@ -97,7 +97,7 @@ func testdoubleRemoveStartEngine(t *testing.T) { func testdoubleRemoveRpcConn(t *testing.T) { var err error - sesRPC, err = newRPCClient(doubleRemove.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + sesRPC, err = engine.NewRPCClient(doubleRemove.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/export_it_test.go b/general_tests/export_it_test.go index 9765adfba..4d2b1a915 100644 --- a/general_tests/export_it_test.go +++ b/general_tests/export_it_test.go @@ -113,7 +113,7 @@ func testExpStartEngine(t *testing.T) { func testExpRPCConn(t *testing.T) { var err error - expRpc, err = newRPCClient(expCfg.ListenCfg()) + expRpc, err = engine.NewRPCClient(expCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/filtered_replication_it_test.go b/general_tests/filtered_replication_it_test.go index 3b2fd4da6..1cf2cadfe 100644 --- a/general_tests/filtered_replication_it_test.go +++ b/general_tests/filtered_replication_it_test.go @@ -142,13 +142,13 @@ func testFltrRplRPCConn(t *testing.T) { tmp := *utils.Encoding // run only under *gob encoding *utils.Encoding = utils.MetaGOB - if fltrRplInternalRPC, err = newRPCClient(fltrRplInternalCfg.ListenCfg()); err != nil { + if fltrRplInternalRPC, err = engine.NewRPCClient(fltrRplInternalCfg.ListenCfg()); err != nil { t.Fatal(err) } - if fltrRplEngine1RPC, err = newRPCClient(fltrRplEngine1Cfg.ListenCfg()); err != nil { + if fltrRplEngine1RPC, err = engine.NewRPCClient(fltrRplEngine1Cfg.ListenCfg()); err != nil { t.Fatal(err) } - if fltrRplEngine2RPC, err = newRPCClient(fltrRplEngine2Cfg.ListenCfg()); err != nil { + if fltrRplEngine2RPC, err = engine.NewRPCClient(fltrRplEngine2Cfg.ListenCfg()); err != nil { t.Fatal(err) } *utils.Encoding = tmp diff --git a/general_tests/filters_it_test.go b/general_tests/filters_it_test.go index cc203c452..34b528107 100644 --- a/general_tests/filters_it_test.go +++ b/general_tests/filters_it_test.go @@ -126,7 +126,7 @@ func testV1FltrStartEngine(t *testing.T) { func testV1FltrRpcConn(t *testing.T) { var err error - fltrRpc, err = newRPCClient(fltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + fltrRpc, err = engine.NewRPCClient(fltrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/fltr_sep_it_test.go b/general_tests/fltr_sep_it_test.go index da295a67c..b66d8a65e 100644 --- a/general_tests/fltr_sep_it_test.go +++ b/general_tests/fltr_sep_it_test.go @@ -103,7 +103,7 @@ func testFltrSepStartEngine(t *testing.T) { func testFltrSepRpcConn(t *testing.T) { var err error - fltrSepRPC, err = newRPCClient(fltrSepCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + fltrSepRPC, err = engine.NewRPCClient(fltrSepCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/fraud_detection_it_test.go b/general_tests/fraud_detection_it_test.go index e3962ad18..49328ab8d 100644 --- a/general_tests/fraud_detection_it_test.go +++ b/general_tests/fraud_detection_it_test.go @@ -123,7 +123,7 @@ func testFraudStartEngine(t *testing.T) { func testFraudRPCConn(t *testing.T) { var err error - fraudRPC, err = newRPCClient(fraudCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + fraudRPC, err = engine.NewRPCClient(fraudCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/gocs_it_test.go b/general_tests/gocs_it_test.go index 56691acc8..46192282b 100644 --- a/general_tests/gocs_it_test.go +++ b/general_tests/gocs_it_test.go @@ -128,13 +128,13 @@ func testGOCSStartEngine(t *testing.T) { // Connect rpc client to rater func testGOCSApierRpcConn(t *testing.T) { var err error - if auRPC, err = newRPCClient(auCfg.ListenCfg()); err != nil { + if auRPC, err = engine.NewRPCClient(auCfg.ListenCfg()); err != nil { t.Fatal(err) } - if usRPC, err = newRPCClient(usCfg.ListenCfg()); err != nil { + if usRPC, err = engine.NewRPCClient(usCfg.ListenCfg()); err != nil { t.Fatal(err) } - if dspRPC, err = newRPCClient(dspCfg.ListenCfg()); err != nil { + if dspRPC, err = engine.NewRPCClient(dspCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/lib_test.go b/general_tests/lib_test.go deleted file mode 100644 index 1ab533f6f..000000000 --- a/general_tests/lib_test.go +++ /dev/null @@ -1,40 +0,0 @@ -//go:build integration || flaky || kafka - -/* -Real-time Online/Offline Charging System (OCS) for Telecom & ISP environments -Copyright (C) ITsysCOM GmbH - -This program is free software: you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation, either version 3 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program. If not, see -*/ -package general_tests - -import ( - "errors" - - "github.com/cgrates/birpc" - "github.com/cgrates/birpc/jsonrpc" - "github.com/cgrates/cgrates/config" - "github.com/cgrates/cgrates/utils" -) - -func newRPCClient(cfg *config.ListenCfg) (c *birpc.Client, err error) { - switch *utils.Encoding { - case utils.MetaJSON: - return jsonrpc.Dial(utils.TCP, cfg.RPCJSONListen) - case utils.MetaGOB: - return birpc.Dial(utils.TCP, cfg.RPCGOBListen) - default: - return nil, errors.New("UNSUPPORTED_RPC") - } -} diff --git a/general_tests/loader_nocontext_it_test.go b/general_tests/loader_nocontext_it_test.go index a090c330d..fd010510e 100644 --- a/general_tests/loader_nocontext_it_test.go +++ b/general_tests/loader_nocontext_it_test.go @@ -113,7 +113,7 @@ func testLoaderNoContextStartEngine(t *testing.T) { func testLoaderNoContextRpcConn(t *testing.T) { var err error - ldrCtxRPC, err = newRPCClient(ldrCtxCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + ldrCtxRPC, err = engine.NewRPCClient(ldrCtxCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/loaders_internal_indexes_it_test.go b/general_tests/loaders_internal_indexes_it_test.go index 0f8f8ba72..e67e8da1d 100644 --- a/general_tests/loaders_internal_indexes_it_test.go +++ b/general_tests/loaders_internal_indexes_it_test.go @@ -103,10 +103,10 @@ func testLoadersIDBIdxItStartEngines(t *testing.T) { func testLoadersIDBIdxItRPCConn(t *testing.T) { var err error - if loadersIDBIdxRPC, err = newRPCClient(loadersIDBIdxCfg.ListenCfg()); err != nil { + if loadersIDBIdxRPC, err = engine.NewRPCClient(loadersIDBIdxCfg.ListenCfg()); err != nil { t.Fatal(err) } - if loadersIDBIdxRPCInternal, err = newRPCClient(loadersIDBIdxCfgInternal.ListenCfg()); err != nil { + if loadersIDBIdxRPCInternal, err = engine.NewRPCClient(loadersIDBIdxCfgInternal.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/poster_it_test.go b/general_tests/poster_it_test.go index a64b9e49e..389d3917a 100644 --- a/general_tests/poster_it_test.go +++ b/general_tests/poster_it_test.go @@ -116,7 +116,7 @@ func testPosterITStartEngine(t *testing.T) { func testPosterITRpcConn(t *testing.T) { var err error - pstrRpc, err = newRPCClient(pstrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + pstrRpc, err = engine.NewRPCClient(pstrCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/redis_cluster_it_test.go b/general_tests/redis_cluster_it_test.go index 10dc30022..3f96ab39c 100644 --- a/general_tests/redis_cluster_it_test.go +++ b/general_tests/redis_cluster_it_test.go @@ -182,7 +182,7 @@ func testClsrStartEngine(t *testing.T) { func testClsrRPCConection(t *testing.T) { var err error - clsrRPC, err = newRPCClient(clsrConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + clsrRPC, err = engine.NewRPCClient(clsrConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/redis_tls_it_test.go b/general_tests/redis_tls_it_test.go index 83cca2696..0baa2fab9 100644 --- a/general_tests/redis_tls_it_test.go +++ b/general_tests/redis_tls_it_test.go @@ -99,7 +99,7 @@ func testRedisTLSStartEngine(t *testing.T) { func testRedisTLSRPCCon(t *testing.T) { var err error - redisTLSRPC, err = newRPCClient(redisTLSCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + redisTLSRPC, err = engine.NewRPCClient(redisTLSCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/reproc_cdrs_for_stats_it_test.go b/general_tests/reproc_cdrs_for_stats_it_test.go index 94c269806..00e889c26 100644 --- a/general_tests/reproc_cdrs_for_stats_it_test.go +++ b/general_tests/reproc_cdrs_for_stats_it_test.go @@ -119,7 +119,7 @@ func testRpcdrsStartEngine(t *testing.T) { func testRpcdrsRpcConn(t *testing.T) { var err error - rpcdrsRpc, err = newRPCClient(rpcdrsCfg.ListenCfg()) + rpcdrsRpc, err = engine.NewRPCClient(rpcdrsCfg.ListenCfg()) if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } @@ -370,7 +370,7 @@ cgrates.org,STAT_AGG,,2014-07-29T15:00:00Z,0,-1,0,*tcd;*tcc;*sum#1,,false,false, t.Fatal(err) } - rpcdrsRpc, err = newRPCClient(rpcdrsCfg.ListenCfg()) + rpcdrsRpc, err = engine.NewRPCClient(rpcdrsCfg.ListenCfg()) if err != nil { t.Fatalf("could not connect to cgr-engine: %v", err) } diff --git a/general_tests/rerate_ers_cdrs_it_test.go b/general_tests/rerate_ers_cdrs_it_test.go index 6f53499e8..f63eb5227 100644 --- a/general_tests/rerate_ers_cdrs_it_test.go +++ b/general_tests/rerate_ers_cdrs_it_test.go @@ -122,7 +122,7 @@ func testRerateCDRsERsStartEngine(t *testing.T) { func testRerateCDRsERsRPCConn(t *testing.T) { var err error - rrErsCdrsRPC, err = newRPCClient(rrErsCdrsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + rrErsCdrsRPC, err = engine.NewRPCClient(rrErsCdrsCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/rerate_exp_it_test.go b/general_tests/rerate_exp_it_test.go index c4fd4b0e0..3977e0bce 100644 --- a/general_tests/rerate_exp_it_test.go +++ b/general_tests/rerate_exp_it_test.go @@ -136,11 +136,11 @@ func testRerateExpStartEngine(t *testing.T) { func testRerateExpRPCConn(t *testing.T) { var err error - ng1RPC, err = newRPCClient(ng1Cfg.ListenCfg()) + ng1RPC, err = engine.NewRPCClient(ng1Cfg.ListenCfg()) if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } - ng2RPC, err = newRPCClient(ng2Cfg.ListenCfg()) + ng2RPC, err = engine.NewRPCClient(ng2Cfg.ListenCfg()) if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/resourcesv1_it_test.go b/general_tests/resourcesv1_it_test.go index 54efea3ee..6eb9379ee 100644 --- a/general_tests/resourcesv1_it_test.go +++ b/general_tests/resourcesv1_it_test.go @@ -99,7 +99,7 @@ func testV1RsStartEngine(t *testing.T) { func testV1RsRpcConn(t *testing.T) { var err error - rlsV1Rpc, err = newRPCClient(rlsV1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + rlsV1Rpc, err = engine.NewRPCClient(rlsV1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/route_it_test.go b/general_tests/route_it_test.go index 07e8ad604..ff29dd27d 100644 --- a/general_tests/route_it_test.go +++ b/general_tests/route_it_test.go @@ -113,7 +113,7 @@ func testV1SplSStartEngine(t *testing.T) { func testV1SplSRpcConn(t *testing.T) { var err error - splSv1Rpc, err = newRPCClient(splSv1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + splSv1Rpc, err = engine.NewRPCClient(splSv1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/routes_cases_it_test.go b/general_tests/routes_cases_it_test.go index f787bc950..a59bde223 100644 --- a/general_tests/routes_cases_it_test.go +++ b/general_tests/routes_cases_it_test.go @@ -126,7 +126,7 @@ func testV1RtsCaseStartEngine(t *testing.T) { func testV1RtsCaseRpcConn(t *testing.T) { var err error - rtsCaseSv1Rpc, err = newRPCClient(rtsCaseSv1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + rtsCaseSv1Rpc, err = engine.NewRPCClient(rtsCaseSv1Cfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/rpccaching_it_test.go b/general_tests/rpccaching_it_test.go index 0579f63dd..bd1716e3e 100644 --- a/general_tests/rpccaching_it_test.go +++ b/general_tests/rpccaching_it_test.go @@ -119,7 +119,7 @@ func testRPCMethodsStartEngine(t *testing.T) { func testRPCMethodsRpcConn(t *testing.T) { var err error - rpcRpc, err = newRPCClient(rpcCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + rpcRpc, err = engine.NewRPCClient(rpcCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/sentinel_it_test.go b/general_tests/sentinel_it_test.go index 981ba326c..8a7ea02a7 100644 --- a/general_tests/sentinel_it_test.go +++ b/general_tests/sentinel_it_test.go @@ -133,7 +133,7 @@ func testRedisSentinelStartEngine(t *testing.T) { func testRedisSentinelRPCCon(t *testing.T) { var err error - sentinelRPC, err = newRPCClient(sentinelConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + sentinelRPC, err = engine.NewRPCClient(sentinelConfig.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/session2_it_test.go b/general_tests/session2_it_test.go index 67dcd8ac2..b4e2f4627 100644 --- a/general_tests/session2_it_test.go +++ b/general_tests/session2_it_test.go @@ -103,7 +103,7 @@ func testSes2ItStartEngine(t *testing.T) { func testSes2ItRPCConn(t *testing.T) { var err error - ses2RPC, err = newRPCClient(ses2Cfg.ListenCfg()) + ses2RPC, err = engine.NewRPCClient(ses2Cfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/session3_it_test.go b/general_tests/session3_it_test.go index c8abfe478..26255793e 100644 --- a/general_tests/session3_it_test.go +++ b/general_tests/session3_it_test.go @@ -110,7 +110,7 @@ func testSes3ItStartEngine(t *testing.T) { func testSes3ItRPCConn(t *testing.T) { var err error - ses3RPC, err = newRPCClient(ses3Cfg.ListenCfg()) + ses3RPC, err = engine.NewRPCClient(ses3Cfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/session4_it_test.go b/general_tests/session4_it_test.go index db654eca1..afe8cee68 100644 --- a/general_tests/session4_it_test.go +++ b/general_tests/session4_it_test.go @@ -100,7 +100,7 @@ func testSes4ItStartEngine(t *testing.T) { func testSes4ItRPCConn(t *testing.T) { var err error - ses4RPC, err = newRPCClient(ses4Cfg.ListenCfg()) + ses4RPC, err = engine.NewRPCClient(ses4Cfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/session_bkup_interval_it_test.go b/general_tests/session_bkup_interval_it_test.go index 485e2475e..7dfccc64c 100644 --- a/general_tests/session_bkup_interval_it_test.go +++ b/general_tests/session_bkup_interval_it_test.go @@ -112,7 +112,7 @@ func testSessionSBkupIntrvlStartEngine(t *testing.T) { // Connect rpc client to rater func testSessionSBkupIntrvlApierRpcConn(t *testing.T) { var err error - if sBkupRPC, err = newRPCClient(sBkupCfg.ListenCfg()); err != nil { + if sBkupRPC, err = engine.NewRPCClient(sBkupCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_graceful_shutdown_it_test.go b/general_tests/session_graceful_shutdown_it_test.go index 9b6cbebeb..4a2e0bd74 100644 --- a/general_tests/session_graceful_shutdown_it_test.go +++ b/general_tests/session_graceful_shutdown_it_test.go @@ -122,10 +122,10 @@ func testSessionSRplcStartEngine(t *testing.T) { // Connect rpc client to rater func testSessionSRplcApierRpcConn(t *testing.T) { var err error - if smgRplcRPC1, err = newRPCClient(smgRplCfg1.ListenCfg()); err != nil { + if smgRplcRPC1, err = engine.NewRPCClient(smgRplCfg1.ListenCfg()); err != nil { t.Fatal(err) } - if smgRplcRPC2, err = newRPCClient(smgRplCfg2.ListenCfg()); err != nil { + if smgRplcRPC2, err = engine.NewRPCClient(smgRplCfg2.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_it_test.go b/general_tests/session_it_test.go index e07122719..2eaba8c3c 100644 --- a/general_tests/session_it_test.go +++ b/general_tests/session_it_test.go @@ -102,7 +102,7 @@ func testSesItStartEngine(t *testing.T) { func testSesItRPCConn(t *testing.T) { var err error - sesRPC, err = newRPCClient(sesCfg.ListenCfg()) + sesRPC, err = engine.NewRPCClient(sesCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/session_money_rating_subject_it_test.go b/general_tests/session_money_rating_subject_it_test.go index d1176aaf1..0e413f3e3 100644 --- a/general_tests/session_money_rating_subject_it_test.go +++ b/general_tests/session_money_rating_subject_it_test.go @@ -121,7 +121,7 @@ func testSesMRSItStartEngine(t *testing.T) { func testSesMRSItRPCConn(t *testing.T) { var err error - if sesMRSRPC, err = newRPCClient(sesMRSCfg.ListenCfg()); err != nil { + if sesMRSRPC, err = engine.NewRPCClient(sesMRSCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_nonereq_it_test.go b/general_tests/session_nonereq_it_test.go index 22e146f32..94100e250 100644 --- a/general_tests/session_nonereq_it_test.go +++ b/general_tests/session_nonereq_it_test.go @@ -101,7 +101,7 @@ func testSesNoneReqTypeItStartEngine(t *testing.T) { func testSesNoneReqTypeItRPCConn(t *testing.T) { var err error - sesNoneReqTypeRPC, err = newRPCClient(sesNoneReqTypeCfg.ListenCfg()) + sesNoneReqTypeRPC, err = engine.NewRPCClient(sesNoneReqTypeCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/session_refund_expired_it_test.go b/general_tests/session_refund_expired_it_test.go index e692e587c..22d7d03b6 100644 --- a/general_tests/session_refund_expired_it_test.go +++ b/general_tests/session_refund_expired_it_test.go @@ -124,7 +124,7 @@ func testSesExpItStartEngine(t *testing.T) { func testSesExpItRPCConn(t *testing.T) { var err error - if sesExpRPC, err = newRPCClient(sesExpCfg.ListenCfg()); err != nil { + if sesExpRPC, err = engine.NewRPCClient(sesExpCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_replications_automaticdebit_it_test.go b/general_tests/session_replications_automaticdebit_it_test.go index 587c28058..41ba63273 100644 --- a/general_tests/session_replications_automaticdebit_it_test.go +++ b/general_tests/session_replications_automaticdebit_it_test.go @@ -146,10 +146,10 @@ func testSessionSRplStartEngine(t *testing.T) { // Connect rpc client to rater func testSessionSRplApierRpcConn(t *testing.T) { var err error - if smgRplcMstrRPC, err = newRPCClient(smgRplcMasterCfg.ListenCfg()); err != nil { + if smgRplcMstrRPC, err = engine.NewRPCClient(smgRplcMasterCfg.ListenCfg()); err != nil { t.Fatal(err) } - if smgRplcSlvRPC, err = newRPCClient(smgRplcSlaveCfg.ListenCfg()); err != nil { + if smgRplcSlvRPC, err = engine.NewRPCClient(smgRplcSlaveCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_rounding_it_test.go b/general_tests/session_rounding_it_test.go index cd41b8f3e..078d48ccb 100644 --- a/general_tests/session_rounding_it_test.go +++ b/general_tests/session_rounding_it_test.go @@ -180,7 +180,7 @@ func testSesRndItStartEngine(t *testing.T) { func testSesRndItRPCConn(t *testing.T) { var err error - if sesRndRPC, err = newRPCClient(sesRndCfg.ListenCfg()); err != nil { + if sesRndRPC, err = engine.NewRPCClient(sesRndCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/session_rpl_prepaid_it_test.go b/general_tests/session_rpl_prepaid_it_test.go index 54416ca40..270dbb32c 100644 --- a/general_tests/session_rpl_prepaid_it_test.go +++ b/general_tests/session_rpl_prepaid_it_test.go @@ -94,7 +94,7 @@ func testSeSRplPrepaidStartEngine(t *testing.T) { // Connect rpc client to rater func testSeSRplPrepaidApierRpcConn(t *testing.T) { var err error - if sesRplPrePaidRPC, err = newRPCClient(sesRplPrePaidCfg.ListenCfg()); err != nil { + if sesRplPrePaidRPC, err = engine.NewRPCClient(sesRplPrePaidCfg.ListenCfg()); err != nil { t.Fatal(err) } } diff --git a/general_tests/sessionpause_it_test.go b/general_tests/sessionpause_it_test.go index dd4717cd2..8b099fd0e 100644 --- a/general_tests/sessionpause_it_test.go +++ b/general_tests/sessionpause_it_test.go @@ -105,7 +105,7 @@ func testSesPauseItStartEngine(t *testing.T) { func testSesPauseItRPCConn(t *testing.T) { var err error - sesPauseRPC, err = newRPCClient(sesPauseCfg.ListenCfg()) + sesPauseRPC, err = engine.NewRPCClient(sesPauseCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index edc00139b..4af8d954f 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -104,7 +104,7 @@ func testSrItStartEngine(t *testing.T) { func testSrItRPCConn(t *testing.T) { var err error - srrpc, err = newRPCClient(srCfg.ListenCfg()) + srrpc, err = engine.NewRPCClient(srCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/sessionroutes_it_test.go b/general_tests/sessionroutes_it_test.go index ba41ffc7c..a8e7be75b 100644 --- a/general_tests/sessionroutes_it_test.go +++ b/general_tests/sessionroutes_it_test.go @@ -103,7 +103,7 @@ func testSesRoutesItStartEngine(t *testing.T) { func testSesRoutesItRPCConn(t *testing.T) { var err error - sesRoutesRPC, err = newRPCClient(sesRoutesCfg.ListenCfg()) + sesRoutesRPC, err = engine.NewRPCClient(sesRoutesCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/sessions_benchmark_it_test.go b/general_tests/sessions_benchmark_it_test.go index d53603ec9..7819524c9 100644 --- a/general_tests/sessions_benchmark_it_test.go +++ b/general_tests/sessions_benchmark_it_test.go @@ -109,7 +109,7 @@ func testSesPItStartEngineWithProfiling(t *testing.T) { func testSesPItRPCConn(t *testing.T) { var err error - sesPRPC, err = newRPCClient(sesPCfg.ListenCfg()) + sesPRPC, err = engine.NewRPCClient(sesPCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/sessions_message_it_test.go b/general_tests/sessions_message_it_test.go index a52c884e1..19ff2398f 100644 --- a/general_tests/sessions_message_it_test.go +++ b/general_tests/sessions_message_it_test.go @@ -100,7 +100,7 @@ func testSesMFDItStartEngine(t *testing.T) { func testSesMFDItRPCConn(t *testing.T) { var err error - sesMFDRPC, err = newRPCClient(sesMFDCfg.ListenCfg()) + sesMFDRPC, err = engine.NewRPCClient(sesMFDCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/sessions_tnt_change_cdr_it_test.go b/general_tests/sessions_tnt_change_cdr_it_test.go index 849fcd3fb..a4db61d8b 100644 --- a/general_tests/sessions_tnt_change_cdr_it_test.go +++ b/general_tests/sessions_tnt_change_cdr_it_test.go @@ -101,7 +101,7 @@ func testSesTntChngCdrsStartEngine(t *testing.T) { func testSesTntChngCdrsRPCConn(t *testing.T) { var err error - sesTntChngRPC, err = newRPCClient(sesTntChngCfg.ListenCfg()) + sesTntChngRPC, err = engine.NewRPCClient(sesTntChngCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/sessions_tnt_change_it_test.go b/general_tests/sessions_tnt_change_it_test.go index b418dcd12..b89ca62d7 100644 --- a/general_tests/sessions_tnt_change_it_test.go +++ b/general_tests/sessions_tnt_change_it_test.go @@ -101,7 +101,7 @@ func testSesTntChngStartEngine(t *testing.T) { func testSesTntChngRPCConn(t *testing.T) { var err error - sesTntChngRPC, err = newRPCClient(sesTntChngCfg.ListenCfg()) + sesTntChngRPC, err = engine.NewRPCClient(sesTntChngCfg.ListenCfg()) if err != nil { t.Fatal(err) } diff --git a/general_tests/shared_client_lock_it_test.go b/general_tests/shared_client_lock_it_test.go index 7ec2df563..1b270b99d 100644 --- a/general_tests/shared_client_lock_it_test.go +++ b/general_tests/shared_client_lock_it_test.go @@ -141,7 +141,7 @@ func testSharedClientLockStartEngine(t *testing.T) { func testSharedClientLockRpcConn(t *testing.T) { var err error - clntLockRPC, err = newRPCClient(clntLockCfg.ListenCfg()) + clntLockRPC, err = engine.NewRPCClient(clntLockCfg.ListenCfg()) if err != nil { t.Fatal("Could not connect to engine: ", err.Error()) } diff --git a/general_tests/tp_it_test.go b/general_tests/tp_it_test.go index fb84be22c..579194a19 100644 --- a/general_tests/tp_it_test.go +++ b/general_tests/tp_it_test.go @@ -115,7 +115,7 @@ func testTpStartEngine(t *testing.T) { // Connect rpc client to rater func testTpRpcConn(t *testing.T) { var err error - tpRPC, err = newRPCClient(tpCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + tpRPC, err = engine.NewRPCClient(tpCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/trends_aut_it_test.go b/general_tests/trends_aut_it_test.go index 9c6cc0639..85f2e4c0d 100644 --- a/general_tests/trends_aut_it_test.go +++ b/general_tests/trends_aut_it_test.go @@ -124,7 +124,7 @@ func testtrendAuQStartEngine(t *testing.T) { func testtrendAuQRpcConn(t *testing.T) { var err error - trendAuQRpc, err = newRPCClient(trendAuQCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + trendAuQRpc, err = engine.NewRPCClient(trendAuQCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index 2a95932a5..2719cfb1a 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -107,7 +107,7 @@ func testTutSMGStartEngine(t *testing.T) { // Connect rpc client to rater func testTutSMGRpcConn(t *testing.T) { var err error - tutSMGRpc, err = newRPCClient(tutSMGCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + tutSMGRpc, err = engine.NewRPCClient(tutSMGCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal(err) } diff --git a/general_tests/tutorial2_it_test.go b/general_tests/tutorial2_it_test.go index d7b99823b..32faa4623 100644 --- a/general_tests/tutorial2_it_test.go +++ b/general_tests/tutorial2_it_test.go @@ -109,7 +109,7 @@ func testTutStopEngine(t *testing.T) { func testTutRpcConn(t *testing.T) { var err error - if tutRpc, err = newRPCClient(tutCfg.ListenCfg()); err != nil { + if tutRpc, err = engine.NewRPCClient(tutCfg.ListenCfg()); err != nil { t.Fatal("could not connect to rater: ", err.Error()) } } diff --git a/general_tests/tutorial_it_test.go b/general_tests/tutorial_it_test.go index ce2c956a8..454cddee2 100644 --- a/general_tests/tutorial_it_test.go +++ b/general_tests/tutorial_it_test.go @@ -114,7 +114,7 @@ func testTutorialStartEngine(t *testing.T) { func testTutorialRpcConn(t *testing.T) { var err error - tutorialRpc, err = newRPCClient(tutorialCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed + tutorialRpc, err = engine.NewRPCClient(tutorialCfg.ListenCfg()) // We connect over JSON so we can also troubleshoot if needed if err != nil { t.Fatal("Could not connect to rater: ", err.Error()) } diff --git a/general_tests/twoengines_it_test.go b/general_tests/twoengines_it_test.go index f385e8b35..023f04259 100644 --- a/general_tests/twoengines_it_test.go +++ b/general_tests/twoengines_it_test.go @@ -98,11 +98,11 @@ func testTwoEnginesStartEngine(t *testing.T) { func testTwoEnginesRPC(t *testing.T) { var err error - engineOneRpc, err = newRPCClient(engineOneCfg.ListenCfg()) + engineOneRpc, err = engine.NewRPCClient(engineOneCfg.ListenCfg()) if err != nil { t.Fatal(err) } - engineTwoRpc, err = newRPCClient(engineTwoCfg.ListenCfg()) + engineTwoRpc, err = engine.NewRPCClient(engineTwoCfg.ListenCfg()) if err != nil { t.Fatal(err) }