c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
parent 1c057d322d
commit 566c6b246a
76 changed files with 328 additions and 736 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/engine/experiment/hirl/fake_test.go
+2
View File
@@ -17,6 +17,8 @@ func (d FakeDialer) DialContext(ctx context.Context, network, address string) (n
return d.Conn, d.Err
}
func (d FakeDialer) CloseIdleConnections() {}
type FakeConn struct {
ReadError error
ReadData []byte
internal/engine/experiment/hirl/hirl.go
+1 -1
View File
@@ -251,7 +251,7 @@ func (meth squidCacheManager) Run(ctx context.Context, config MethodConfig) {
type RunMethodConfig struct {
MethodConfig
Name string
NewDialer func(config netx.Config) netx.Dialer
NewDialer func(config netx.Config) model.Dialer
RequestLine string
}
internal/engine/experiment/hirl/hirl_test.go
+4 -4
View File
@@ -388,7 +388,7 @@ func TestRunMethodDialFailure(t *testing.T) {
Out: out,
},
Name: "random_invalid_version_number",
NewDialer: func(config netx.Config) netx.Dialer {
NewDialer: func(config netx.Config) model.Dialer {
return FakeDialer{Err: expected}
},
RequestLine: "GET / HTTP/ABC",
@@ -435,7 +435,7 @@ func TestRunMethodSetDeadlineFailure(t *testing.T) {
Out: out,
},
Name: "random_invalid_version_number",
NewDialer: func(config netx.Config) netx.Dialer {
NewDialer: func(config netx.Config) model.Dialer {
return FakeDialer{Conn: &FakeConn{
SetDeadlineError: expected,
}}
@@ -484,7 +484,7 @@ func TestRunMethodWriteFailure(t *testing.T) {
Out: out,
},
Name: "random_invalid_version_number",
NewDialer: func(config netx.Config) netx.Dialer {
NewDialer: func(config netx.Config) model.Dialer {
return FakeDialer{Conn: &FakeConn{
WriteError: expected,
}}
@@ -532,7 +532,7 @@ func TestRunMethodReadEOFWithWrongData(t *testing.T) {
Out: out,
},
Name: "random_invalid_version_number",
NewDialer: func(config netx.Config) netx.Dialer {
NewDialer: func(config netx.Config) model.Dialer {
return FakeDialer{Conn: &FakeConn{
ReadData: []byte("0xdeadbeef"),
}}