cleanup: merge legacy errorsx in netxlite and hide classifiers (#655)

This diff implements the first two cleanups defined at https://github.com/ooni/probe/issues/1956:

> - [ ] observe that `netxlite` and `netx` differ in error wrapping only in the way in which we set `ErrWrapper.Operation`. Observe that the code using `netxlite` does not care about such a field. Therefore, we can modify `netxlite` to set such a field using the code of `netx` and we can remove `netx` specific code for errors (which currently lives inside of the `./internal/engine/legacy/errorsx` package
>
> - [ ] after we've done the previous cleanup, we can make all the classifiers code private, since there's no code outside `netxlite` that needs them

A subsequent diff will address the remaining cleanup.

While there, notice that there are failing, unrelated obfs4 tests, so disable them in short mode. (I am confident these tests are unrelated because they fail for me when running test locally from the `master` branch.)

internal/engine/experiment/websteps/control.go

@@ -3,7 +3,6 @@ package websteps
 import (
 	"context"
 
-	errorsxlegacy "github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx"
 	"github.com/ooni/probe-cli/v3/internal/httpx"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
@@ -19,9 +18,9 @@ func Control(
 		Logger:     sess.Logger(),
 	}
 	// make sure error is wrapped
-	err = errorsxlegacy.SafeErrWrapperBuilder{
-		Error:     clnt.WithBodyLogging().Build().PostJSON(ctx, resourcePath, creq, &out),
-		Operation: netxlite.TopLevelOperation,
-	}.MaybeBuild()
+	err = clnt.WithBodyLogging().Build().PostJSON(ctx, resourcePath, creq, &out)
+	if err != nil {
+		err = netxlite.NewTopLevelGenericErrWrapper(err)
+	}
 	return
 }

internal/engine/experiment/websteps/factory.go

@@ -12,8 +12,6 @@ import (
 	"github.com/lucas-clemente/quic-go"
 	"github.com/lucas-clemente/quic-go/http3"
 	oohttp "github.com/ooni/oohttp"
-	"github.com/ooni/probe-cli/v3/internal/engine/legacy/errorsx"
-	"github.com/ooni/probe-cli/v3/internal/engine/netx/quicdialer"
 	"github.com/ooni/probe-cli/v3/internal/model"
 	"github.com/ooni/probe-cli/v3/internal/netxlite"
 	"github.com/ooni/probe-cli/v3/internal/runtimex"
@@ -34,28 +32,28 @@ func NewRequest(ctx context.Context, URL *url.URL, headers http.Header) *http.Re
 
 // NewDialerResolver contructs a new dialer for TCP connections,
 // with default, errorwrapping and resolve functionalities
-func NewDialerResolver(resolver netxlite.ResolverLegacy) netxlite.DialerLegacy {
-	var d netxlite.DialerLegacy = netxlite.DefaultDialer
-	d = &errorsx.ErrorWrapperDialer{Dialer: d}
+func NewDialerResolver(resolver netxlite.ResolverLegacy) model.Dialer {
+	var d model.Dialer = netxlite.DefaultDialer
+	d = &netxlite.ErrorWrapperDialer{Dialer: d}
 	d = &netxlite.DialerResolver{
 		Resolver: netxlite.NewResolverLegacyAdapter(resolver),
-		Dialer:   netxlite.NewDialerLegacyAdapter(d),
+		Dialer:   d,
 	}
 	return d
 }
 
 // NewQUICDialerResolver creates a new QUICDialerResolver
 // with default, errorwrapping and resolve functionalities
-func NewQUICDialerResolver(resolver netxlite.ResolverLegacy) netxlite.QUICContextDialer {
-	var ql quicdialer.QUICListener = &netxlite.QUICListenerStdlib{}
-	ql = &errorsx.ErrorWrapperQUICListener{QUICListener: ql}
-	var dialer netxlite.QUICContextDialer = &netxlite.QUICDialerQUICGo{
+func NewQUICDialerResolver(resolver netxlite.ResolverLegacy) model.QUICDialer {
+	var ql model.QUICListener = &netxlite.QUICListenerStdlib{}
+	ql = &netxlite.ErrorWrapperQUICListener{QUICListener: ql}
+	var dialer model.QUICDialer = &netxlite.QUICDialerQUICGo{
 		QUICListener: ql,
 	}
-	dialer = &errorsx.ErrorWrapperQUICDialer{Dialer: dialer}
+	dialer = &netxlite.ErrorWrapperQUICDialer{QUICDialer: dialer}
 	dialer = &netxlite.QUICDialerResolver{
 		Resolver: netxlite.NewResolverLegacyAdapter(resolver),
-		Dialer:   netxlite.NewQUICDialerFromContextDialerAdapter(dialer),
+		Dialer:   dialer,
 	}
 	return dialer
 }