Dropping the wrapper

Author: alexlivekit

pkg/sip/client.go

@@ -40,37 +40,17 @@ import (
 )
 
 // An interface mirroring sipgo.Client to be able to mock it in tests.
+// Note: *sipgo.Client implements this interface directly, so no wrapper is needed.
 type SIPClient interface {
-	TransactionRequest(req *sip.Request) (sip.ClientTransaction, error)
-	WriteRequest(req *sip.Request) error
+	TransactionRequest(req *sip.Request, options ...sipgo.ClientRequestOption) (sip.ClientTransaction, error)
+	WriteRequest(req *sip.Request, options ...sipgo.ClientRequestOption) error
 	Close() error
 }
 
-// Passthrough implementation of SIPClient with a sipgo.Client.
-type sipgoClientWrapper struct {
-	client *sipgo.Client
-}
-
-func (w *sipgoClientWrapper) TransactionRequest(req *sip.Request) (sip.ClientTransaction, error) {
-	return w.client.TransactionRequest(req)
-}
-
-func (w *sipgoClientWrapper) WriteRequest(req *sip.Request) error {
-	return w.client.WriteRequest(req)
-}
-
-func (w *sipgoClientWrapper) Close() error {
-	return w.client.Close()
-}
-
 type GetSipClientFunc func(ua *sipgo.UserAgent, options ...sipgo.ClientOption) (SIPClient, error)
 
 func DefaultGetSipClientFunc(ua *sipgo.UserAgent, options ...sipgo.ClientOption) (SIPClient, error) {
-	client, err := sipgo.NewClient(ua, options...)
-	if err != nil {
-		return nil, err
-	}
-	return &sipgoClientWrapper{client: client}, nil
+	return sipgo.NewClient(ua, options...)
 }
 
 type Client struct {

pkg/sip/outbound_utilities_test.go

@@ -363,7 +363,10 @@ func (w *testSIPClient) FillRequestBlanks(req *sip.Request) {
 	}
 }
 
-func (w *testSIPClient) TransactionRequest(req *sip.Request) (sip.ClientTransaction, error) {
+func (w *testSIPClient) TransactionRequest(req *sip.Request, options ...sipgo.ClientRequestOption) (sip.ClientTransaction, error) {
+	if len(options) > 0 {
+		panic("options not supported for testSIPClient")
+	}
 	fmt.Printf("SIP TransactionRequest sent on client %v:\n%s\n", w, req.String())
 	w.FillRequestBlanks(req)
 	w.sequence++
@@ -386,7 +389,10 @@ func (w *testSIPClient) TransactionRequest(req *sip.Request) (sip.ClientTransact
 	}
 }
 
-func (w *testSIPClient) WriteRequest(req *sip.Request) error {
+func (w *testSIPClient) WriteRequest(req *sip.Request, options ...sipgo.ClientRequestOption) error {
+	if len(options) > 0 {
+		panic("options not supported for testSIPClient")
+	}
 	fmt.Printf("SIP WriteRequest sent on client %v:\n%s\n", w, req.String())
 	w.FillRequestBlanks(req)
 	w.sequence++