Fix tests

channels/joinedChannel_test.go

@@ -43,7 +43,7 @@ func Test_manager_store(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -89,7 +89,7 @@ func Test_manager_loadChannels(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -161,7 +161,7 @@ func Test_manager_addChannel(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -206,7 +206,7 @@ func Test_manager_addChannel_ChannelAlreadyExistsErr(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -242,7 +242,7 @@ func Test_manager_removeChannel(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -287,7 +287,7 @@ func Test_manager_removeChannel_ChannelDoesNotExistsErr(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -319,7 +319,7 @@ func Test_manager_getChannel(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -360,7 +360,7 @@ func Test_manager_getChannel_ChannelDoesNotExistsErr(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -393,7 +393,7 @@ func Test_manager_getChannels(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -472,7 +472,7 @@ func Test_loadJoinedChannel(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		new(mockEventModel))
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
@@ -601,6 +601,10 @@ func (m *mockBroadcastClient) RemoveHealthCallback(uint64)           {}
 // Mock EventModel                                                            //
 ////////////////////////////////////////////////////////////////////////////////
 
+func mockEventModelBuilder(string) EventModel {
+	return &mockEventModel{}
+}
+
 // mockEventModel adheres to the EventModel interface.
 type mockEventModel struct {
 	joinedCh *cryptoBroadcast.Channel

channels/manager_test.go

@@ -33,8 +33,6 @@ func TestMain(m *testing.M) {
 }
 
 func TestManager_JoinChannel(t *testing.T) {
-	mem := &mockEventModel{}
-
 	rng := rand.New(rand.NewSource(64))
 
 	pi, err := cryptoChannel.GenerateIdentity(rng)
@@ -45,12 +43,13 @@ func TestManager_JoinChannel(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		mem)
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
 
 	m := mFace.(*manager)
+	mem := m.events.model.(*mockEventModel)
 
 	ch, _, err := newTestChannel("name", "description", m.rng.GetStream())
 	if err != nil {
@@ -76,7 +75,6 @@ func TestManager_JoinChannel(t *testing.T) {
 }
 
 func TestManager_LeaveChannel(t *testing.T) {
-	mem := &mockEventModel{}
 
 	rng := rand.New(rand.NewSource(64))
 
@@ -88,12 +86,13 @@ func TestManager_LeaveChannel(t *testing.T) {
 	mFace, err := NewManager(pi, versioned.NewKV(ekv.MakeMemstore()),
 		new(mockBroadcastClient),
 		fastRNG.NewStreamGenerator(1, 1, csprng.NewSystemRNG),
-		mem)
+		mockEventModelBuilder)
 	if err != nil {
 		t.Errorf(err.Error())
 	}
 
 	m := mFace.(*manager)
+	mem := m.events.model.(*mockEventModel)
 
 	ch, _, err := newTestChannel("name", "description", m.rng.GetStream())
 	if err != nil {