imapclient: clean up function signature of New, allowing for future options too

imapserver/compress_test.go

@@ -40,11 +40,6 @@ func TestCompressStartTLS(t *testing.T) {
 	tc.transactf("ok", "append inbox (\\seen) {%d+}\r\n%s", len(exampleMsg), exampleMsg)
 	tc.transactf("ok", "noop")
 	tc.transactf("ok", "fetch 1 body.peek[1]")
-
-	// Prevent client.Close from failing the test. The client first closes the
-	// compression stream, which causes the server to close the connection, after which
-	// the messages to close the TLS connection are written to a closed socket.
-	tc.client.SetPanic(false)
 }
 
 func TestCompressBreak(t *testing.T) {

imapserver/fuzz_test.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"net"
 	"os"
 	"path/filepath"
@@ -126,7 +127,11 @@ func FuzzServer(f *testing.F) {
 
 				err := clientConn.SetDeadline(time.Now().Add(time.Second))
 				flog(err, "set client deadline")
-				client, _ := imapclient.New(mox.Cid(), clientConn, true)
+				opts := imapclient.Opts{
+					Logger: slog.Default().With("cid", mox.Cid()),
+					Error:  func(err error) { panic(err) },
+				}
+				client, _ := imapclient.New(clientConn, &opts)
 
 				for _, cmd := range cmds {
 					client.Commandf("", "%s", cmd)

imapserver/server_test.go

@@ -7,6 +7,7 @@ import (
 	"crypto/tls"
 	"crypto/x509"
 	"fmt"
+	"log/slog"
 	"math/big"
 	"net"
 	"os"
@@ -536,8 +537,11 @@ func startArgsMore(t *testing.T, uidonly, first, immediateTLS bool, serverConfig
 		serve("test", cid, serverConfig, serverConn, immediateTLS, allowLoginWithoutTLS, viaHTTPS, "")
 		close(done)
 	}()
-	client, err := imapclient.New(connCounter, clientConn, true)
-	tcheck(t, err, "new client")
+	opts := imapclient.Opts{
+		Logger: slog.Default().With("cid", connCounter),
+		Error:  func(err error) { panic(err) },
+	}
+	client, _ := imapclient.New(clientConn, &opts)
 	tc := &testconn{t: t, conn: clientConn, client: client, uidonly: uidonly, done: done, serverConn: serverConn, account: acc}
 	if first {
 		tc.switchStop = switchStop