c/ooni-probe-cli
Watch
1
0
Fork
You've already forked ooni-probe-cli
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

cleanup: remove unnecessary legacy interfaces (#656)

Browse source 
This diff addresses another point of https://github.com/ooni/probe/issues/1956:

> - [ ] observe that we're still using a bunch of private interfaces for common interfaces such as the `Dialer`, so we can get rid of these private interfaces and always use the ones in `model`, which allows us to remove a bunch of legacy wrappers

Additional cleanups may still be possible. The more I cleanup, the more I see
there's extra legacy code we can dispose of (which seems good?).
This commit is contained in:
Simone Basso 2022-01-07 18:33:37 +01:00 • committed by GitHub
commit 566c6b246a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
76 changed files with 326 additions and 734 deletions
Download patch file Download diff file Expand all files Collapse all files

9
internal/engine/netx/dialer/saver.go
View file

@ -6,12 +6,13 @@ import (
"time"
"github.com/ooni/probe-cli/v3/internal/engine/netx/trace"
"github.com/ooni/probe-cli/v3/internal/model"
"github.com/ooni/probe-cli/v3/internal/netxlite"
)
// saverDialer saves events occurring during the dial
type saverDialer struct {
Dialer
model.Dialer
Saver *trace.Saver
}
@ -34,7 +35,7 @@ func (d *saverDialer) DialContext(ctx context.Context, network, address string)
// saverConnDialer wraps the returned connection such that we
// collect all the read/write events that occur.
type saverConnDialer struct {
Dialer
model.Dialer
Saver *trace.Saver
}
@ -82,6 +83,6 @@ func (c *saverConn) Write(p []byte) (int, error) {
return count, err
}
var _ Dialer = &saverDialer{}
var _ Dialer = &saverConnDialer{}
var _ model.Dialer = &saverDialer{}
var _ model.Dialer = &saverConnDialer{}
var _ net.Conn = &saverConn{}