Clean up logging

[rbdr/mobius] / hotline / chat.go

diff --git a/hotline/chat.go b/hotline/chat.go
index 6f2a4dd7098016c8a137843b42f496ea3ac21faa..dcde1d3a2466e6baaee4505812598f0cdaca0b46 100644 (file)
--- a/hotline/chat.go
+++ b/hotline/chat.go
@@ -23,41 +23,6 @@ type ChatManager interface {
        Members(id ChatID) []*ClientConn
 }
 
        Members(id ChatID) []*ClientConn
 }
 

-type MockChatManager struct {
-       mock.Mock
-}
-
-func (m *MockChatManager) New(cc *ClientConn) ChatID {
-       args := m.Called(cc)
-
-       return args.Get(0).(ChatID)
-}
-
-func (m *MockChatManager) GetSubject(id ChatID) string {
-       args := m.Called(id)
-
-       return args.String(0)
-}
-
-func (m *MockChatManager) Join(id ChatID, cc *ClientConn) {
-       m.Called(id, cc)
-}
-
-func (m *MockChatManager) Leave(id ChatID, clientID [2]byte) {
-       m.Called(id, clientID)
-}
-
-func (m *MockChatManager) SetSubject(id ChatID, subject string) {
-       m.Called(id, subject)
-
-}
-
-func (m *MockChatManager) Members(id ChatID) []*ClientConn {
-       args := m.Called(id)
-
-       return args.Get(0).([]*ClientConn)
-}
-

 type MemChatManager struct {
        chats map[ChatID]*PrivateChat
 
 type MemChatManager struct {
        chats map[ChatID]*PrivateChat
 


@@ -135,3 +100,38 @@ func (cm *MemChatManager) SetSubject(id ChatID, subject string) {
 
        chat.Subject = subject
 }
 
        chat.Subject = subject
 }

+
+type MockChatManager struct {
+       mock.Mock
+}
+
+func (m *MockChatManager) New(cc *ClientConn) ChatID {
+       args := m.Called(cc)
+
+       return args.Get(0).(ChatID)
+}
+
+func (m *MockChatManager) GetSubject(id ChatID) string {
+       args := m.Called(id)
+
+       return args.String(0)
+}
+
+func (m *MockChatManager) Join(id ChatID, cc *ClientConn) {
+       m.Called(id, cc)
+}
+
+func (m *MockChatManager) Leave(id ChatID, clientID [2]byte) {
+       m.Called(id, clientID)
+}
+
+func (m *MockChatManager) SetSubject(id ChatID, subject string) {
+       m.Called(id, subject)
+
+}
+
+func (m *MockChatManager) Members(id ChatID) []*ClientConn {
+       args := m.Called(id)
+
+       return args.Get(0).([]*ClientConn)
+}