Removed CDRStorage

engine/cdrs.go

@@ -44,10 +44,8 @@ func newMapEventFromReqForm(r *http.Request) (mp MapEvent, err error) {
 // NewCDRServer is a constructor for CDRServer
 func NewCDRServer(cfg *config.CGRConfig, storDBChan chan StorDB, dm *DataManager, filterS *FilterS,
 	connMgr *ConnManager) *CDRServer {
-	cdrDB := <-storDBChan
 	return &CDRServer{
 		cfg:        cfg,
-		cdrDB:      cdrDB,
 		dm:         dm,
 		guard:      guardian.Guardian,
 		fltrS:      filterS,
@@ -59,7 +57,6 @@ func NewCDRServer(cfg *config.CGRConfig, storDBChan chan StorDB, dm *DataManager
 // CDRServer stores and rates CDRs
 type CDRServer struct {
 	cfg        *config.CGRConfig
-	cdrDB      CdrStorage
 	dm         *DataManager
 	guard      *guardian.GuardianLocker
 	fltrS      *FilterS
@@ -73,11 +70,10 @@ func (cdrS *CDRServer) ListenAndServe(stopChan chan struct{}) {
 		select {
 		case <-stopChan:
 			return
-		case stordb, ok := <-cdrS.storDBChan:
+		case _, ok := <-cdrS.storDBChan:
 			if !ok { // the chanel was closed by the shutdown of stordbService
 				return
 			}
-			cdrS.cdrDB = stordb
 		}
 	}
 }

engine/cdrs_test.go

@@ -42,7 +42,6 @@ func TestCDRsNewCDRServer(t *testing.T) {
 	newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
 	expected := &CDRServer{
 		cfg:        cfg,
-		cdrDB:      sent,
 		dm:         dm,
 		guard:      guardian.Guardian,
 		fltrS:      fltrs,
@@ -54,47 +53,6 @@ func TestCDRsNewCDRServer(t *testing.T) {
 	}
 }
 
-func TestCDRsListenAndServeCaseStorDBChanOK(t *testing.T) {
-	var sent StorDB
-	cfg := config.NewDefaultCGRConfig()
-	storDBChan := make(chan StorDB, 1)
-	storDBChan <- sent
-	dm := &DataManager{}
-	fltrs := &FilterS{}
-	connMng := &ConnManager{}
-	newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
-	stopChan := make(chan struct{}, 1)
-	func() {
-		storDBChan <- sent
-		time.Sleep(10 * time.Millisecond)
-		stopChan <- struct{}{}
-	}()
-	newCDRSrv.ListenAndServe(stopChan)
-	if !reflect.DeepEqual(newCDRSrv.cdrDB, sent) {
-		t.Errorf("\nExpected <%+v> \n, received <%+v>", sent, newCDRSrv.cdrDB)
-	}
-}
-
-func TestCDRsListenAndServeCaseStorDBChanNotOK(t *testing.T) {
-	var sent StorDB
-	cfg := config.NewDefaultCGRConfig()
-	storDBChan := make(chan StorDB, 1)
-	storDBChan <- sent
-	dm := &DataManager{}
-	fltrs := &FilterS{}
-	connMng := &ConnManager{}
-	newCDRSrv := NewCDRServer(cfg, storDBChan, dm, fltrs, connMng)
-	stopChan := make(chan struct{}, 1)
-	func() {
-		time.Sleep(30 * time.Millisecond)
-		close(storDBChan)
-	}()
-	newCDRSrv.ListenAndServe(stopChan)
-	if !reflect.DeepEqual(newCDRSrv.cdrDB, nil) {
-		t.Errorf("\nExpected <%+v> \n, received <%+v>", nil, newCDRSrv.cdrDB)
-	}
-}
-
 func TestCDRsChrgrSProcessEventErrMsnConnIDs(t *testing.T) {
 	var sent StorDB
 	cfg := config.NewDefaultCGRConfig()

engine/storage_interface.go

@@ -111,15 +111,11 @@ type DataDBDriver interface {
 }
 
 type StorDB interface {
-	CdrStorage
+	Storage
 	LoadReader
 	LoadWriter
 }
 
-type CdrStorage interface {
-	Storage
-}
-
 type LoadStorage interface {
 	Storage
 	LoadReader

engine/storage_test.go

@@ -74,6 +74,4 @@ func TestMsgpackTime(t *testing.T) {
 func TestStoreInterfaces(t *testing.T) {
 	rds := new(RedisStorage)
 	var _ DataDB = rds
-	sql := new(SQLStorage)
-	var _ CdrStorage = sql
 }