From 25fa01fee01945b730d48758d711e5af4e34884b Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Thu, 4 May 2023 02:16:28 -0400 Subject: [PATCH] Solve compilation errors after library update --- engine/account_test.go | 9 +++--- engine/actions_test.go | 7 +++-- engine/cdrs_test.go | 14 ++++----- engine/datamanager_test.go | 62 +++++++++++++++++++------------------- engine/stats_test.go | 9 +++--- 5 files changed, 52 insertions(+), 49 deletions(-) diff --git a/engine/account_test.go b/engine/account_test.go index ba96522ac..a1453dd9e 100644 --- a/engine/account_test.go +++ b/engine/account_test.go @@ -22,9 +22,10 @@ import ( "testing" "time" + "github.com/cgrates/birpc" + "github.com/cgrates/birpc/context" "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" - "github.com/cgrates/rpcclient" ) var ( @@ -2616,8 +2617,8 @@ func TestPublishAccount(t *testing.T) { defer func() { cfgfunc() }() - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, _ interface{}) error { if serviceMethod == utils.StatSv1ProcessEvent { return nil @@ -2628,7 +2629,7 @@ func TestPublishAccount(t *testing.T) { } return utils.ErrNotFound }) - conngMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + conngMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStatS): clientConn, utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds): clientConn, }) diff --git a/engine/actions_test.go b/engine/actions_test.go index 4da97e2b8..5829f7445 100644 --- a/engine/actions_test.go +++ b/engine/actions_test.go @@ -24,6 +24,7 @@ import ( "testing" "time" + "github.com/cgrates/birpc" "github.com/cgrates/birpc/context" "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" @@ -2682,8 +2683,8 @@ func TestActionSetDestinations(t *testing.T) { Count: 3, } - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, reply interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, reply interface{}) error { if serviceMethod == utils.StatSv1GetStatQueue { rpl := &StatQueue{ Tenant: "cgrates.org", @@ -2696,7 +2697,7 @@ func TestActionSetDestinations(t *testing.T) { } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStatS): clientConn, }) dm := NewDataManager(NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items), cfg.CacheCfg(), nil) diff --git a/engine/cdrs_test.go b/engine/cdrs_test.go index c6003409e..bf7f1b7e1 100644 --- a/engine/cdrs_test.go +++ b/engine/cdrs_test.go @@ -614,7 +614,7 @@ func TestCDRSThDSProcessEvent(t *testing.T) { // cfg.CdrsCfg().RaterConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaRALs)} // cdrS := &CDRServer{cgrCfg: cfg, dm: dm, cdrDb: db} -// clientConn := make(chan rpcclient.ClientConnector, 1) +// clientConn := make(chan birpc.ClientConnector, 1) // clientConn <- clMock(func(serviceMethod string, _, _ interface{}) error { // if serviceMethod == utils.ResponderRefundIncrements { @@ -734,8 +734,8 @@ func TestCDRsV1ProcessEventAll(t *testing.T) { cfg.CdrsCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) dm := NewDataManager(db, cfg.CacheCfg(), nil) - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMeth string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMeth string, _, _ interface{}) error { if serviceMeth == utils.ThresholdSv1ProcessEvent { return nil } @@ -748,7 +748,7 @@ func TestCDRsV1ProcessEventAll(t *testing.T) { cgrCfg: cfg, dm: dm, cdrDb: db, - connMgr: NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr: NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStatS): clientConn, utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds): clientConn, }), @@ -837,8 +837,8 @@ func TestRemoveThresholdProfileRpl(t *testing.T) { db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) cfg.DataDbCfg().Items[utils.MetaThresholdProfiles].Replicate = true cfg.DataDbCfg().RplConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1)} - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(servicemethod string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context,servicemethod string, _, _ interface{}) error { if servicemethod == utils.ReplicatorSv1RemoveThresholdProfile { return nil @@ -846,7 +846,7 @@ func TestRemoveThresholdProfileRpl(t *testing.T) { return utils.ErrNotImplemented }) - dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, })) thp := &ThresholdProfile{ diff --git a/engine/datamanager_test.go b/engine/datamanager_test.go index e77e8ccb9..9d03cf406 100644 --- a/engine/datamanager_test.go +++ b/engine/datamanager_test.go @@ -1382,8 +1382,8 @@ func TestDMGetThresholdRmt(t *testing.T) { cfg.DataDbCfg().Items[utils.MetaThresholds].Remote = true cfg.DataDbCfg().RmtConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1)} db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, reply interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, reply interface{}) error { if serviceMethod == utils.ReplicatorSv1GetThreshold { rpl := &Threshold{ Tenant: "cgrates.org", ID: "THD_Stat", Hits: 1, @@ -1393,7 +1393,7 @@ func TestDMGetThresholdRmt(t *testing.T) { } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, }) dm := NewDataManager(db, cfg.CacheCfg(), connMgr) @@ -1413,8 +1413,8 @@ func TestDmGetRatingPlanRmt(t *testing.T) { }() Cache.Clear(nil) db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, reply interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, reply interface{}) error { if serviceMethod == utils.ReplicatorSv1GetRatingPlan { rpl := &RatingPlan{ Id: "RP1", @@ -1439,7 +1439,7 @@ func TestDmGetRatingPlanRmt(t *testing.T) { } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, }) dm := NewDataManager(db, cfg.CacheCfg(), connMgr) @@ -1459,8 +1459,8 @@ func TestDMGetTimingRmt(t *testing.T) { cfg2, _ := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg2) }() - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, reply interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, reply interface{}) error { if serviceMethod == utils.ReplicatorSv1GetTiming { rpl := &utils.TPTiming{ ID: "WEEKENDS", @@ -1476,7 +1476,7 @@ func TestDMGetTimingRmt(t *testing.T) { } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, }) dm := NewDataManager(db, cfg.CacheCfg(), connMgr) @@ -1497,8 +1497,8 @@ func TestSetResourceProfileRPl(t *testing.T) { cfg2, _ := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg2) }() - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, reply interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, reply interface{}) error { if serviceMethod == utils.ReplicatorSv1GetResourceProfile { rpl := &ResourceProfile{ Tenant: "cgrates.org", @@ -1520,7 +1520,7 @@ func TestSetResourceProfileRPl(t *testing.T) { } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, }) dm := NewDataManager(db, cfg.CacheCfg(), connMgr) @@ -1541,8 +1541,8 @@ func TestDMGetActionTriggersRmt(t *testing.T) { cfg2, _ := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg2) }() - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, reply interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, reply interface{}) error { if serviceMethod == utils.ReplicatorSv1GetActionTriggers { rpl := ActionTriggers{ &ActionTrigger{ @@ -1566,7 +1566,7 @@ func TestDMGetActionTriggersRmt(t *testing.T) { } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, }) dm := NewDataManager(db, cfg.CacheCfg(), connMgr) @@ -1587,15 +1587,15 @@ func TestDMRemSQPRepl(t *testing.T) { cfg.DataDbCfg().Items[utils.MetaStatQueueProfiles].Replicate = true cfg.DataDbCfg().RplConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1)} db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, _ interface{}) error { if serviceMethod == utils.ReplicatorSv1RemoveStatQueueProfile { return nil } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, }) dm := NewDataManager(db, cfg.CacheCfg(), connMgr) @@ -1629,15 +1629,15 @@ func TestDmRemoveFilter(t *testing.T) { config.SetCgrConfig(cfg2) }() db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, _ interface{}) error { if serviceMethod == utils.ReplicatorSv1RemoveFilter { return nil } return utils.ErrNotImplemented }) - dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn})) + dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan birpc.ClientConnector{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn})) dm.SetFilter(&Filter{ Tenant: "cgrates.org", ID: "FLTR_CP", @@ -1679,8 +1679,8 @@ func TestDMGetSupplierProfile(t *testing.T) { cfg2, _ := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg2) }() - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, reply interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, reply interface{}) error { if serviceMethod == utils.ReplicatorSv1GetSupplierProfile { rpl := &SupplierProfile{} *reply.(**SupplierProfile) = rpl @@ -1689,7 +1689,7 @@ func TestDMGetSupplierProfile(t *testing.T) { return utils.ErrNotFound }) db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) - dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, })) config.SetCgrConfig(cfg) @@ -1711,7 +1711,7 @@ func TestConnManagerCallWithConnIDs(t *testing.T) { }, }, } - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{}) + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{}) if err := connMgr.CallWithConnIDs([]string{connId}, utils.StringSet{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): {}}, utils.ReplicatorSv1GetAccount, nil, nil); err == nil { t.Error(err) @@ -1727,14 +1727,14 @@ func TestDMRemResourceProfile(t *testing.T) { }() cfg.DataDbCfg().Items[utils.MetaResourceProfile].Replicate = true cfg.DataDbCfg().RplConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1)} - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, _ interface{}) error { if serviceMethod == utils.ReplicatorSv1RemoveResourceProfile { return nil } return utils.ErrNotImplemented }) - dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, })) rsP := &ResourceProfile{ @@ -1768,14 +1768,14 @@ func TestDMSetSQPrf(t *testing.T) { Cache.Clear(nil) cfg.DataDbCfg().Items[utils.MetaStatQueueProfiles].Replicate = true cfg.DataDbCfg().RplConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1)} - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, _ interface{}) error { if serviceMethod == utils.ReplicatorSv1SetStatQueueProfile { return nil } return utils.ErrNotImplemented }) - dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + dm := NewDataManager(db, cfg.CacheCfg(), NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.ReplicatorSv1): clientConn, })) sqp := &StatQueueProfile{ diff --git a/engine/stats_test.go b/engine/stats_test.go index 77cfe1f93..df1c06a55 100644 --- a/engine/stats_test.go +++ b/engine/stats_test.go @@ -23,9 +23,10 @@ import ( "testing" "time" + "github.com/cgrates/birpc" + "github.com/cgrates/birpc/context" "github.com/cgrates/cgrates/config" "github.com/cgrates/cgrates/utils" - "github.com/cgrates/rpcclient" ) var ( @@ -673,15 +674,15 @@ func TestStatProcessEvent2(t *testing.T) { cfg.StatSCfg().ThresholdSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds)} db := NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items) dm := NewDataManager(db, cfg.CacheCfg(), nil) - clientConn := make(chan rpcclient.ClientConnector, 1) - clientConn <- clMock(func(serviceMethod string, _, _ interface{}) error { + clientConn := make(chan birpc.ClientConnector, 1) + clientConn <- clMock(func(ctx *context.Context, serviceMethod string, _, _ interface{}) error { if serviceMethod == utils.ThresholdSv1ProcessEvent { return nil } return utils.ErrNotImplemented }) - connMgr := NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ + connMgr := NewConnManager(cfg, map[string]chan birpc.ClientConnector{ utils.ConcatenatedKey(utils.MetaInternal, utils.MetaThresholds): clientConn, }) sts, err := NewStatService(dm, cfg, NewFilterS(cfg, nil, dm), connMgr)