all: upd dnscrypt; imp tests (8)

Author: ainar-g

go.mod

@@ -3,15 +3,13 @@ module github.com/AdguardTeam/dnsproxy
 go 1.26.4
 
 require (
-	github.com/AdguardTeam/dnscrypt v0.0.1
+	github.com/AdguardTeam/dnscrypt v0.0.2
 	github.com/AdguardTeam/golibs v0.35.13
 	github.com/ameshkov/dnsstamps v1.0.3
 	github.com/beefsack/go-rate v0.0.0-20220214233405-116f4ca011a0
 	github.com/bluele/gcache v0.0.2
 	github.com/miekg/dns v1.1.72
 	github.com/patrickmn/go-cache v2.1.0+incompatible
-	// TODO(s.chzhen):  Update after investigation of the 0-RTT bug/behavior
-	// when TestUpstreamDoH_serverRestart/http3/second_try keeps failing.
 	github.com/quic-go/quic-go v0.60.0
 	github.com/stretchr/testify v1.11.1
 	golang.org/x/exp v0.0.0-20260611194520-c48552f49976 // indirect

go.sum

@@ -4,8 +4,8 @@ cloud.google.com/go/auth v0.20.0 h1:kXTssoVb4azsVDoUiF8KvxAqrsQcQtB53DcSgta74CA=
 cloud.google.com/go/auth v0.20.0/go.mod h1:942/yi/itH1SsmpyrbnTMDgGfdy2BUqIKyd0cyYLc5Q=
 cloud.google.com/go/compute/metadata v0.9.0 h1:pDUj4QMoPejqq20dK0Pg2N4yG9zIkYGdBtwLoEkH9Zs=
 cloud.google.com/go/compute/metadata v0.9.0/go.mod h1:E0bWwX5wTnLPedCKqk3pJmVgCBSM6qQI1yTBdEb3C10=
-github.com/AdguardTeam/dnscrypt v0.0.1 h1:TWaEbHjuKkMCNpXANv70aPlTQsLFrjRFdIwdJUtzmPM=
-github.com/AdguardTeam/dnscrypt v0.0.1/go.mod h1:qCFs51rLfNzEDZqb6nz1tocVLnEearJ1zng6O3I6ecA=
+github.com/AdguardTeam/dnscrypt v0.0.2 h1:kIFCyjYofKHug7RwPGOjVga81P0/zOQdbUN+7p+I95M=
+github.com/AdguardTeam/dnscrypt v0.0.2/go.mod h1:qCFs51rLfNzEDZqb6nz1tocVLnEearJ1zng6O3I6ecA=
 github.com/AdguardTeam/golibs v0.35.13 h1:sflm5/sWhiGwUXNAZObiqVMkdg8HeYVFK2A0oJ27hbU=
 github.com/AdguardTeam/golibs v0.35.13/go.mod h1:8EEGG4auTDd8HV3tBETXLkuxDH9lk9vvFbJn+wbmypg=
 github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk=

internal/middleware/middleware_internal_test.go

@@ -3,7 +3,6 @@ package middleware
 import (
 	"net"
 	"net/netip"
-	"os"
 	"path"
 	"path/filepath"
 	"testing"
@@ -23,13 +22,6 @@ import (
 // testLogger is a common logger for tests.
 var testLogger = slogutil.NewDiscardLogger()
 
-// TODO(e.burkov):  Remove when [hostsfile.DefaultStorage] stops using [log].
-func TestMain(m *testing.M) {
-	testutil.DiscardLogOutput(m)
-
-	os.Exit(m.Run())
-}
-
 // TODO(e.burkov):  Add helpers to initialize [proxy.Proxy] to [dnsproxytest]
 // and rewrite the tests.
 

proxy/proxy_test.go

@@ -129,6 +129,7 @@ func TestProxy_Resolve_cache(t *testing.T) {
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
 			p, err := proxy.New(&proxy.Config{
+				Logger:         testLogger,
 				UDPListenAddr:  []*net.UDPAddr{net.UDPAddrFromAddrPort(localhostAnyPort)},
 				UpstreamConfig: upsConf,
 				CacheEnabled:   tc.prxCacheEnabled,
@@ -165,6 +166,7 @@ func TestProxy_Start_closeOnFail(t *testing.T) {
 	}
 
 	p, err := proxy.New(&proxy.Config{
+		Logger: testLogger,
 		// Add a free address.
 		UDPListenAddr: []*net.UDPAddr{net.UDPAddrFromAddrPort(localhostAnyPort)},
 		// Add a bound address.

upstream/upstream_internal_test.go

@@ -41,12 +41,11 @@ var testLogger = slogutil.NewDiscardLogger()
 
 // TODO(ameshkov): Make tests here not depend on external servers.
 
-// TODO(d.kolyshev): Remove this after quic-go has migrated to slog.
 func TestMain(m *testing.M) {
 	// See https://github.com/quic-go/quic-go/issues/4228.
 	errors.Check(os.Setenv("QUIC_GO_DISABLE_GSO", "1"))
 
-	testutil.DiscardLogOutput(m)
+	os.Exit(m.Run())
 }
 
 // TODO(a.garipov):  Refactor.