From 041bc9757893e3d28f2b04310c5fb9b726b8ff8f Mon Sep 17 00:00:00 2001 From: xfy Date: Wed, 3 Jun 2026 17:46:58 +0800 Subject: [PATCH] refactor: remove unused code identified by staticcheck --- internal/app/app_test.go | 4 --- internal/app/testutil.go | 10 +------ internal/http3/server_test.go | 44 ------------------------------ internal/proxy/proxy_dns_test.go | 6 ---- internal/server/pool_bench_test.go | 1 - internal/server/testutil.go | 3 -- internal/server/upgrade_test.go | 10 +------ 7 files changed, 2 insertions(+), 76 deletions(-) diff --git a/internal/app/app_test.go b/internal/app/app_test.go index 58bf2cc..17a1573 100644 --- a/internal/app/app_test.go +++ b/internal/app/app_test.go @@ -444,11 +444,7 @@ func TestAppFields(t *testing.T) { -// customSig 实现自定义信号类型用于测试 -type customSig struct{} -func (customSig) String() string { return "custom" } -func (customSig) Signal() {} diff --git a/internal/app/testutil.go b/internal/app/testutil.go index b7f36b5..91b14e0 100644 --- a/internal/app/testutil.go +++ b/internal/app/testutil.go @@ -7,13 +7,5 @@ // 作者:xfy package app -import ( - "rua.plus/lolly/internal/config" - "rua.plus/lolly/internal/logging" -) -// setupTestLogger 创建一个测试用的日志记录器。 -// 返回一个使用默认配置的 AppLogger,适用于测试场景。 -func setupTestLogger() *logging.AppLogger { - return logging.NewAppLogger(&config.LoggingConfig{}) -} + diff --git a/internal/http3/server_test.go b/internal/http3/server_test.go index 88d0c43..0b64354 100644 --- a/internal/http3/server_test.go +++ b/internal/http3/server_test.go @@ -11,16 +11,8 @@ package http3 import ( - "crypto/rand" - "crypto/rsa" "crypto/tls" - "crypto/x509" - "crypto/x509/pkix" - "encoding/pem" - "math/big" - "net" "testing" - "time" "github.com/valyala/fasthttp" "rua.plus/lolly/internal/config" @@ -134,40 +126,4 @@ func TestNewServer_Success(t *testing.T) { // TestStart_InvalidListenAddress 测试无效监听地址 -// generateTestCertificate 生成用于测试的自签名证书 -func generateTestCertificate(t *testing.T) tls.Certificate { - t.Helper() - // 使用 RSA 密钥生成自签名证书 - tmpl := &x509.Certificate{ - SerialNumber: big.NewInt(1), - Subject: pkix.Name{CommonName: "localhost"}, - NotBefore: time.Now(), - NotAfter: time.Now().Add(time.Hour), - KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, - ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, - BasicConstraintsValid: true, - DNSNames: []string{"localhost"}, - IPAddresses: []net.IP{net.ParseIP("127.0.0.1")}, - } - - priv, err := rsa.GenerateKey(rand.Reader, 2048) - if err != nil { - t.Fatalf("Failed to generate RSA key: %v", err) - } - - certDER, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &priv.PublicKey, priv) - if err != nil { - t.Fatalf("Failed to create certificate: %v", err) - } - - certPEM := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: certDER}) - keyPEM := pem.EncodeToMemory(&pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}) - - cert, err := tls.X509KeyPair(certPEM, keyPEM) - if err != nil { - t.Fatalf("Failed to load certificate: %v", err) - } - - return cert -} diff --git a/internal/proxy/proxy_dns_test.go b/internal/proxy/proxy_dns_test.go index 493584d..6a6ae8e 100644 --- a/internal/proxy/proxy_dns_test.go +++ b/internal/proxy/proxy_dns_test.go @@ -88,12 +88,6 @@ func (m *mockResolver) Stats() resolver.Stats { } } -func (m *mockResolver) getLookupWithCacheCalls() int { - m.mu.RLock() - defer m.mu.RUnlock() - return m.lookupWithCacheCalls -} - // TestSetResolver 测试设置 DNS 解析器。 func TestSetResolver(t *testing.T) { cfg := &config.ProxyConfig{ diff --git a/internal/server/pool_bench_test.go b/internal/server/pool_bench_test.go index a8c1e28..55f5d6c 100644 --- a/internal/server/pool_bench_test.go +++ b/internal/server/pool_bench_test.go @@ -302,7 +302,6 @@ func BenchmarkPoolMemoryReuse(b *testing.B) { // 模拟池化结构体 type pooledTask struct { data []byte - id int } taskPool := &sync.Pool{ diff --git a/internal/server/testutil.go b/internal/server/testutil.go index 8b5c588..2515ed4 100644 --- a/internal/server/testutil.go +++ b/internal/server/testutil.go @@ -11,9 +11,6 @@ import ( "rua.plus/lolly/internal/ssl" ) -// testListenAddr 是测试用的随机端口监听地址 -const testListenAddr = "127.0.0.1:0" - // MockFastServer 是 fasthttp.Server 的 Mock 包装 // 定义在此文件以便 TestServerOptions 可以引用 type MockFastServer struct { diff --git a/internal/server/upgrade_test.go b/internal/server/upgrade_test.go index f562997..aa44fe6 100644 --- a/internal/server/upgrade_test.go +++ b/internal/server/upgrade_test.go @@ -287,12 +287,4 @@ func TestGetInheritedListeners_EnvPreserved(t *testing.T) { } } -// containsString 检查字符串是否包含子串 -func containsString(s, substr string) bool { - for i := 0; i <= len(s)-len(substr); i++ { - if s[i:i+len(substr)] == substr { - return true - } - } - return false -} +