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(netx): remove more legacy names and functions (#658)

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

> - [ ] we can remove legacy names from `./internal/engine/netx/resolver/legacy.go`
>
> - [ ] we can remove `DialTLSContext` from `./internal/engine/netx/resolver/tls_test.go`

More cleanups may follow.
This commit is contained in:
Simone Basso 2022-01-07 20:02:19 +01:00 • committed by GitHub
commit 554ae47c5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 60 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

40
internal/engine/netx/netx_test.go
View file

@ -591,11 +591,11 @@ func TestNewDNSClientPowerdnsDoH(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(*resolver.DNSOverHTTPS); !ok {
if _, ok := r.Transport().(*netxlite.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -607,11 +607,11 @@ func TestNewDNSClientGoogleDoH(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(*resolver.DNSOverHTTPS); !ok {
if _, ok := r.Transport().(*netxlite.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -623,11 +623,11 @@ func TestNewDNSClientCloudflareDoH(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(*resolver.DNSOverHTTPS); !ok {
if _, ok := r.Transport().(*netxlite.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -640,7 +640,7 @@ func TestNewDNSClientCloudflareDoHSaver(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@ -648,7 +648,7 @@ func TestNewDNSClientCloudflareDoHSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
if _, ok := txp.RoundTripper.(*resolver.DNSOverHTTPS); !ok {
if _, ok := txp.DNSTransport.(*netxlite.DNSOverHTTPS); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -660,11 +660,11 @@ func TestNewDNSClientUDP(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
if _, ok := r.Transport().(*resolver.DNSOverUDP); !ok {
if _, ok := r.Transport().(*netxlite.DNSOverUDP); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -677,7 +677,7 @@ func TestNewDNSClientUDPDNSSaver(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@ -685,7 +685,7 @@ func TestNewDNSClientUDPDNSSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
if _, ok := txp.RoundTripper.(*resolver.DNSOverUDP); !ok {
if _, ok := txp.DNSTransport.(*netxlite.DNSOverUDP); !ok {
t.Fatal("not the transport we expected")
}
dnsclient.CloseIdleConnections()
@ -697,11 +697,11 @@ func TestNewDNSClientTCP(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
txp, ok := r.Transport().(*resolver.DNSOverTCP)
txp, ok := r.Transport().(*netxlite.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}
@ -718,7 +718,7 @@ func TestNewDNSClientTCPDNSSaver(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@ -726,7 +726,7 @@ func TestNewDNSClientTCPDNSSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
dotcp, ok := txp.RoundTripper.(*resolver.DNSOverTCP)
dotcp, ok := txp.DNSTransport.(*netxlite.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}
@ -742,11 +742,11 @@ func TestNewDNSClientDoT(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
txp, ok := r.Transport().(*resolver.DNSOverTCP)
txp, ok := r.Transport().(*netxlite.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}
@ -763,7 +763,7 @@ func TestNewDNSClientDoTDNSSaver(t *testing.T) {
if err != nil {
t.Fatal(err)
}
r, ok := dnsclient.Resolver.(*resolver.SerialResolver)
r, ok := dnsclient.Resolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@ -771,7 +771,7 @@ func TestNewDNSClientDoTDNSSaver(t *testing.T) {
if !ok {
t.Fatal("not the transport we expected")
}
dotls, ok := txp.RoundTripper.(*resolver.DNSOverTCP)
dotls, ok := txp.DNSTransport.(*netxlite.DNSOverTCP)
if !ok {
t.Fatal("not the transport we expected")
}