refactor: move ErrorWrapperTLSHandshaker to errorsx (#418)

Part of https://github.com/ooni/probe/issues/1505

internal/engine/netx/tlsdialer/tls.go

@@ -8,7 +8,6 @@ import (
 	"time"
 
 	"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx"
-	"github.com/ooni/probe-cli/v3/internal/errorsx"
 )
 
 // UnderlyingDialer is the underlying dialer type.
@@ -22,24 +21,6 @@ type TLSHandshaker interface {
 		net.Conn, tls.ConnectionState, error)
 }
 
-// ErrorWrapperTLSHandshaker wraps the returned error to be an OONI error
-type ErrorWrapperTLSHandshaker struct {
-	TLSHandshaker
-}
-
-// Handshake implements Handshaker.Handshake
-func (h ErrorWrapperTLSHandshaker) Handshake(
-	ctx context.Context, conn net.Conn, config *tls.Config,
-) (net.Conn, tls.ConnectionState, error) {
-	tlsconn, state, err := h.TLSHandshaker.Handshake(ctx, conn, config)
-	err = errorsx.SafeErrWrapperBuilder{
-		Classifier: errorsx.ClassifyTLSFailure,
-		Error:      err,
-		Operation:  errorsx.TLSHandshakeOperation,
-	}.MaybeBuild()
-	return tlsconn, state, err
-}
-
 // EmitterTLSHandshaker emits events using the MeasurementRoot
 type EmitterTLSHandshaker struct {
 	TLSHandshaker

internal/engine/netx/tlsdialer/tls_test.go

@@ -11,7 +11,6 @@ import (
 	"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/handlers"
 	"github.com/ooni/probe-cli/v3/internal/engine/legacy/netx/modelx"
 	"github.com/ooni/probe-cli/v3/internal/engine/netx/tlsdialer"
-	"github.com/ooni/probe-cli/v3/internal/errorsx"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 )
 
@@ -38,28 +37,6 @@ func (c *SetDeadlineConn) SetDeadline(t time.Time) error {
 	return nil
 }
 
-func TestErrorWrapperTLSHandshakerFailure(t *testing.T) {
-	h := tlsdialer.ErrorWrapperTLSHandshaker{TLSHandshaker: tlsdialer.EOFTLSHandshaker{}}
-	conn, _, err := h.Handshake(
-		context.Background(), tlsdialer.EOFConn{}, new(tls.Config))
-	if !errors.Is(err, io.EOF) {
-		t.Fatal("not the error that we expected")
-	}
-	if conn != nil {
-		t.Fatal("expected nil con here")
-	}
-	var errWrapper *errorsx.ErrWrapper
-	if !errors.As(err, &errWrapper) {
-		t.Fatal("cannot cast to ErrWrapper")
-	}
-	if errWrapper.Failure != errorsx.FailureEOFError {
-		t.Fatal("unexpected Failure")
-	}
-	if errWrapper.Operation != errorsx.TLSHandshakeOperation {
-		t.Fatal("unexpected Operation")
-	}
-}
-
 func TestEmitterTLSHandshakerFailure(t *testing.T) {
 	saver := &handlers.SavingHandler{}
 	ctx := modelx.WithMeasurementRoot(context.Background(), &modelx.MeasurementRoot{