X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/blobdiff_plain/7cd900d61edbd6d322db3cecb913adf574389320..95159e5585762c06c654945070ba54262b7dcec9:/hotline/server_test.go?ds=sidebyside

diff --git a/hotline/server_test.go b/hotline/server_test.go
index d3e4325..3a368e0 100644
--- a/hotline/server_test.go
+++ b/hotline/server_test.go
@@ -5,8 +5,8 @@ import (
 	"context"
 	"fmt"
 	"github.com/stretchr/testify/assert"
-	"go.uber.org/zap"
 	"io"
+	"log/slog"
 	"os"
 	"sync"
 	"testing"
@@ -32,18 +32,15 @@ func TestServer_handleFileTransfer(t *testing.T) {
 		Agreement     []byte
 		Clients       map[uint16]*ClientConn
 		ThreadedNews  *ThreadedNews
-		FileTransfers map[uint32]*FileTransfer
+		fileTransfers map[[4]byte]*FileTransfer
 		Config        *Config
 		ConfigDir     string
-		Logger        *zap.SugaredLogger
+		Logger        *slog.Logger
 		PrivateChats  map[uint32]*PrivateChat
 		NextGuestID   *uint16
 		TrackerPassID [4]byte
 		Stats         *Stats
 		FS            FileStore
-		outbox        chan Transaction
-		mux           sync.Mutex
-		flatNewsMux   sync.Mutex
 		FlatNews      []byte
 	}
 	type args struct {
@@ -116,12 +113,24 @@ func TestServer_handleFileTransfer(t *testing.T) {
 					}()},
 				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{},
+						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 +177,7 @@ func TestServer_handleFileTransfer(t *testing.T) {
 				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,