Merge pull request #96 from jhalter/disconnect_ban_users_earlier_in_login_flow

[rbdr/mobius] / hotline / server_test.go

diff --git a/hotline/server_test.go b/hotline/server_test.go
index d3e43250aeb840af203270a4312c04a997a274ba..0eb76f0768e27c67c236c2460f2b7da8c24d23a2 100644 (file)
--- a/hotline/server_test.go
+++ b/hotline/server_test.go
@@ -32,7 +32,7 @@ func TestServer_handleFileTransfer(t *testing.T) {
                Agreement     []byte
                Clients       map[uint16]*ClientConn
                ThreadedNews  *ThreadedNews
                Agreement     []byte
                Clients       map[uint16]*ClientConn
                ThreadedNews  *ThreadedNews

-               FileTransfers map[uint32]*FileTransfer
+               fileTransfers map[[4]byte]*FileTransfer

                Config        *Config
                ConfigDir     string
                Logger        *zap.SugaredLogger
                Config        *Config
                ConfigDir     string
                Logger        *zap.SugaredLogger


@@ -41,7 +41,6 @@ func TestServer_handleFileTransfer(t *testing.T) {
                TrackerPassID [4]byte
                Stats         *Stats
                FS            FileStore
                TrackerPassID [4]byte
                Stats         *Stats
                FS            FileStore

-               outbox        chan Transaction

                mux           sync.Mutex
                flatNewsMux   sync.Mutex
                FlatNews      []byte
                mux           sync.Mutex
                flatNewsMux   sync.Mutex
                FlatNews      []byte


@@ -116,12 +115,24 @@ func TestServer_handleFileTransfer(t *testing.T) {
                                        }()},
                                Logger: NewTestLogger(),
                                Stats:  &Stats{},
                                        }()},
                                Logger: NewTestLogger(),
                                Stats:  &Stats{},

-                               FileTransfers: map[uint32]*FileTransfer{
-                                       uint32(5): {
+                               fileTransfers: map[[4]byte]*FileTransfer{
+                                       [4]byte{0, 0, 0, 5}: {

                                                ReferenceNumber: []byte{0, 0, 0, 5},
                                                Type:            FileDownload,
                                                FileName:        []byte("testfile-8b"),
                                                FilePath:        []byte{},
                                                ReferenceNumber: []byte{0, 0, 0, 5},
                                                Type:            FileDownload,
                                                FileName:        []byte("testfile-8b"),
                                                FilePath:        []byte{},

+                                               ClientConn: &ClientConn{
+                                                       Account: &Account{
+                                                               Login: "foo",
+                                                       },
+                                                       transfersMU: sync.Mutex{},
+                                                       transfers: map[int]map[[4]byte]*FileTransfer{
+                                                               FileDownload: {
+                                                                       [4]byte{0, 0, 0, 5}: &FileTransfer{},
+                                                               },
+                                                       },
+                                               },
+                                               bytesSentCounter: &WriteCounter{},

                                        },
                                },
                        },
                                        },
                                },
                        },


@@ -168,7 +179,7 @@ func TestServer_handleFileTransfer(t *testing.T) {
                                Agreement:     tt.fields.Agreement,
                                Clients:       tt.fields.Clients,
                                ThreadedNews:  tt.fields.ThreadedNews,
                                Agreement:     tt.fields.Agreement,
                                Clients:       tt.fields.Clients,
                                ThreadedNews:  tt.fields.ThreadedNews,

-                               FileTransfers: tt.fields.FileTransfers,
+                               fileTransfers: tt.fields.fileTransfers,

                                Config:        tt.fields.Config,
                                ConfigDir:     tt.fields.ConfigDir,
                                Logger:        tt.fields.Logger,
                                Config:        tt.fields.Config,
                                ConfigDir:     tt.fields.ConfigDir,
                                Logger:        tt.fields.Logger,