feat(wip): test reworks (need to add back traffic logger tests)

core/internal/integration_tests/utils_test.go

@@ -1,7 +1,6 @@
 package integration_tests
 
 import (
-	"bytes"
 	"crypto/tls"
 	"io"
 	"net"
@@ -35,18 +34,6 @@ func serverConn() (net.PacketConn, net.Addr, error) {
 	return udpConn, udpAddr, nil
 }
 
-type pwAuthenticator struct {
-	Password string
-	ID       string
-}
-
-func (a *pwAuthenticator) Authenticate(addr net.Addr, auth string, tx uint64) (ok bool, id string) {
-	if auth != a.Password {
-		return false, ""
-	}
-	return true, a.ID
-}
-
 // tcpEchoServer is a TCP server that echoes what it reads from the connection.
 // It will never actively close the connection.
 type tcpEchoServer struct {
@@ -70,92 +57,6 @@ func (s *tcpEchoServer) Close() error {
 	return s.Listener.Close()
 }
 
-// tcpDoubleEchoServer is a TCP server that echoes twice what it reads from the connection.
-// It will never actively close the connection.
-type tcpDoubleEchoServer struct {
-	Listener net.Listener
-}
-
-func (s *tcpDoubleEchoServer) Serve() error {
-	for {
-		conn, err := s.Listener.Accept()
-		if err != nil {
-			return err
-		}
-		go func() {
-			buf := make([]byte, 1024)
-			for {
-				n, err := conn.Read(buf)
-				if err != nil {
-					_ = conn.Close()
-					return
-				}
-				_, _ = conn.Write(buf[:n])
-				_, _ = conn.Write(buf[:n])
-			}
-		}()
-	}
-}
-
-func (s *tcpDoubleEchoServer) Close() error {
-	return s.Listener.Close()
-}
-
-type sinkEvent struct {
-	Data []byte
-	Err  error
-}
-
-// tcpSinkServer is a TCP server that reads data from the connection,
-// and sends what it read to the channel when the connection is closed.
-type tcpSinkServer struct {
-	Listener net.Listener
-	Ch       chan<- sinkEvent
-}
-
-func (s *tcpSinkServer) Serve() error {
-	for {
-		conn, err := s.Listener.Accept()
-		if err != nil {
-			return err
-		}
-		go func() {
-			var buf bytes.Buffer
-			_, err := io.Copy(&buf, conn)
-			_ = conn.Close()
-			s.Ch <- sinkEvent{Data: buf.Bytes(), Err: err}
-		}()
-	}
-}
-
-func (s *tcpSinkServer) Close() error {
-	return s.Listener.Close()
-}
-
-// tcpSenderServer is a TCP server that sends data to the connection,
-// and closes the connection when all data has been sent.
-type tcpSenderServer struct {
-	Listener net.Listener
-	Data     []byte
-}
-
-func (s *tcpSenderServer) Serve() error {
-	for {
-		conn, err := s.Listener.Accept()
-		if err != nil {
-			return err
-		}
-		go func() {
-			_, _ = conn.Write(s.Data)
-			_ = conn.Close()
-		}()
-	}
-}
-
-func (s *tcpSenderServer) Close() error {
-	return s.Listener.Close()
-}
-
 // udpEchoServer is a UDP server that echoes what it reads from the connection.
 // It will never actively close the connection.
 type udpEchoServer struct {
@@ -179,140 +80,3 @@ func (s *udpEchoServer) Serve() error {
 func (s *udpEchoServer) Close() error {
 	return s.Conn.Close()
 }
-
-// udpDoubleEchoServer is a UDP server that echoes twice what it reads from the connection.
-// It will never actively close the connection.
-type udpDoubleEchoServer struct {
-	Conn net.PacketConn
-}
-
-func (s *udpDoubleEchoServer) Serve() error {
-	buf := make([]byte, 65536)
-	for {
-		n, addr, err := s.Conn.ReadFrom(buf)
-		if err != nil {
-			return err
-		}
-		_, err = s.Conn.WriteTo(buf[:n], addr)
-		if err != nil {
-			return err
-		}
-		_, err = s.Conn.WriteTo(buf[:n], addr)
-		if err != nil {
-			return err
-		}
-	}
-}
-
-func (s *udpDoubleEchoServer) Close() error {
-	return s.Conn.Close()
-}
-
-type connectEvent struct {
-	Addr net.Addr
-	ID   string
-	TX   uint64
-}
-
-type disconnectEvent struct {
-	Addr net.Addr
-	ID   string
-	Err  error
-}
-
-type tcpRequestEvent struct {
-	Addr    net.Addr
-	ID      string
-	ReqAddr string
-}
-
-type tcpErrorEvent struct {
-	Addr    net.Addr
-	ID      string
-	ReqAddr string
-	Err     error
-}
-
-type udpRequestEvent struct {
-	Addr      net.Addr
-	ID        string
-	SessionID uint32
-}
-
-type udpErrorEvent struct {
-	Addr      net.Addr
-	ID        string
-	SessionID uint32
-	Err       error
-}
-
-type channelEventLogger struct {
-	ConnectEventCh    chan connectEvent
-	DisconnectEventCh chan disconnectEvent
-	TCPRequestEventCh chan tcpRequestEvent
-	TCPErrorEventCh   chan tcpErrorEvent
-	UDPRequestEventCh chan udpRequestEvent
-	UDPErrorEventCh   chan udpErrorEvent
-}
-
-func (l *channelEventLogger) Connect(addr net.Addr, id string, tx uint64) {
-	if l.ConnectEventCh != nil {
-		l.ConnectEventCh <- connectEvent{
-			Addr: addr,
-			ID:   id,
-			TX:   tx,
-		}
-	}
-}
-
-func (l *channelEventLogger) Disconnect(addr net.Addr, id string, err error) {
-	if l.DisconnectEventCh != nil {
-		l.DisconnectEventCh <- disconnectEvent{
-			Addr: addr,
-			ID:   id,
-			Err:  err,
-		}
-	}
-}
-
-func (l *channelEventLogger) TCPRequest(addr net.Addr, id, reqAddr string) {
-	if l.TCPRequestEventCh != nil {
-		l.TCPRequestEventCh <- tcpRequestEvent{
-			Addr:    addr,
-			ID:      id,
-			ReqAddr: reqAddr,
-		}
-	}
-}
-
-func (l *channelEventLogger) TCPError(addr net.Addr, id, reqAddr string, err error) {
-	if l.TCPErrorEventCh != nil {
-		l.TCPErrorEventCh <- tcpErrorEvent{
-			Addr:    addr,
-			ID:      id,
-			ReqAddr: reqAddr,
-			Err:     err,
-		}
-	}
-}
-
-func (l *channelEventLogger) UDPRequest(addr net.Addr, id string, sessionID uint32, reqAddr string) {
-	if l.UDPRequestEventCh != nil {
-		l.UDPRequestEventCh <- udpRequestEvent{
-			Addr:      addr,
-			ID:        id,
-			SessionID: sessionID,
-		}
-	}
-}
-
-func (l *channelEventLogger) UDPError(addr net.Addr, id string, sessionID uint32, err error) {
-	if l.UDPErrorEventCh != nil {
-		l.UDPErrorEventCh <- udpErrorEvent{
-			Addr:      addr,
-			ID:        id,
-			SessionID: sessionID,
-			Err:       err,
-		}
-	}
-}