c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
parent 423a3feacc
commit 554ae47c5a
8 changed files with 60 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/engine/experiment/urlgetter/configurer_test.go
+8 -8
View File
@@ -116,7 +116,7 @@ func TestConfigurerNewConfigurationResolverDNSOverHTTPSPowerdns(t *testing.T) {
if configuration.HTTPConfig.BaseResolver == nil {
t.Fatal("not the BaseResolver we expected")
}
sr, ok := configuration.HTTPConfig.BaseResolver.(*resolver.SerialResolver)
sr, ok := configuration.HTTPConfig.BaseResolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@@ -124,7 +124,7 @@ func TestConfigurerNewConfigurationResolverDNSOverHTTPSPowerdns(t *testing.T) {
if !ok {
t.Fatal("not the DNS transport we expected")
}
dohtxp, ok := stxp.RoundTripper.(*resolver.DNSOverHTTPS)
dohtxp, ok := stxp.DNSTransport.(*netxlite.DNSOverHTTPS)
if !ok {
t.Fatal("not the DNS transport we expected")
}
@@ -192,7 +192,7 @@ func TestConfigurerNewConfigurationResolverDNSOverHTTPSGoogle(t *testing.T) {
if configuration.HTTPConfig.BaseResolver == nil {
t.Fatal("not the BaseResolver we expected")
}
sr, ok := configuration.HTTPConfig.BaseResolver.(*resolver.SerialResolver)
sr, ok := configuration.HTTPConfig.BaseResolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@@ -200,7 +200,7 @@ func TestConfigurerNewConfigurationResolverDNSOverHTTPSGoogle(t *testing.T) {
if !ok {
t.Fatal("not the DNS transport we expected")
}
dohtxp, ok := stxp.RoundTripper.(*resolver.DNSOverHTTPS)
dohtxp, ok := stxp.DNSTransport.(*netxlite.DNSOverHTTPS)
if !ok {
t.Fatal("not the DNS transport we expected")
}
@@ -268,7 +268,7 @@ func TestConfigurerNewConfigurationResolverDNSOverHTTPSCloudflare(t *testing.T)
if configuration.HTTPConfig.BaseResolver == nil {
t.Fatal("not the BaseResolver we expected")
}
sr, ok := configuration.HTTPConfig.BaseResolver.(*resolver.SerialResolver)
sr, ok := configuration.HTTPConfig.BaseResolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@@ -276,7 +276,7 @@ func TestConfigurerNewConfigurationResolverDNSOverHTTPSCloudflare(t *testing.T)
if !ok {
t.Fatal("not the DNS transport we expected")
}
dohtxp, ok := stxp.RoundTripper.(*resolver.DNSOverHTTPS)
dohtxp, ok := stxp.DNSTransport.(*netxlite.DNSOverHTTPS)
if !ok {
t.Fatal("not the DNS transport we expected")
}
@@ -344,7 +344,7 @@ func TestConfigurerNewConfigurationResolverUDP(t *testing.T) {
if configuration.HTTPConfig.BaseResolver == nil {
t.Fatal("not the BaseResolver we expected")
}
sr, ok := configuration.HTTPConfig.BaseResolver.(*resolver.SerialResolver)
sr, ok := configuration.HTTPConfig.BaseResolver.(*netxlite.SerialResolver)
if !ok {
t.Fatal("not the resolver we expected")
}
@@ -352,7 +352,7 @@ func TestConfigurerNewConfigurationResolverUDP(t *testing.T) {
if !ok {
t.Fatal("not the DNS transport we expected")
}
udptxp, ok := stxp.RoundTripper.(*resolver.DNSOverUDP)
udptxp, ok := stxp.DNSTransport.(*netxlite.DNSOverUDP)
if !ok {
t.Fatal("not the DNS transport we expected")
}