Pull request: all: fix lint and naming issues vol. 4

Merge in DNS/adguard-home from 2276-fix-lint-4 to master Updates #2276. Squashed commit of the following: commit 15d4918 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 8 15:51:34 2020 +0300 util: fix naming commit 3b9a86a Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Dec 8 15:41:10 2020 +0300 all: fix lint and naming issues vol. 4
AdguardTeam · Dec 8, 2020 · 73c3059 · 73c3059
1 parent b7bf7f7
commit 73c3059
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 23 deletions.
diff --git a/internal/agherr/agherr.go b/internal/agherr/agherr.go
@@ -65,3 +65,9 @@ func (e *manyError) Unwrap() error {
 
 	return e.underlying[0]
 }
+
+// wrapper is a copy of the hidden errors.wrapper interface for tests, linting,
+// etc.
+type wrapper interface {
+	Unwrap() error
+}
diff --git a/internal/agherr/agherr_test.go b/internal/agherr/agherr_test.go
@@ -41,6 +41,8 @@ func TestError_Error(t *testing.T) {
 }
 
 func TestError_Unwrap(t *testing.T) {
+	var _ wrapper = &manyError{}
+
 	const (
 		errSimple = iota
 		errWrapped

diff --git a/internal/dnsfilter/dnsfilter.go b/internal/dnsfilter/dnsfilter.go
@@ -129,8 +129,6 @@ const (
 	NotFilteredNotFound Reason = iota
 	// NotFilteredWhiteList - the host is explicitly whitelisted
 	NotFilteredWhiteList
-	// NotFilteredError - there was a transitive error during check
-	NotFilteredError
 
 	// reasons for filtering
 
@@ -777,12 +775,3 @@ func (d *Dnsfilter) Start() {
 		d.registerBlockedServicesHandlers()
 	}
 }
-
-//
-// stats
-//
-
-// GetStats return dns filtering stats since startup.
-func (d *Dnsfilter) GetStats() Stats {
-	return gctx.stats
-}
diff --git a/internal/sysutil/syslog_others.go b/internal/sysutil/syslog_others.go
@@ -3,8 +3,9 @@
 package sysutil
 
 import (
-	"log"
 	"log/syslog"
+
+	"github.com/AdguardTeam/golibs/log"
 )
 
 func configureSyslog(serviceName string) error {

diff --git a/internal/sysutil/syslog_windows.go b/internal/sysutil/syslog_windows.go
@@ -3,9 +3,9 @@
 package sysutil
 
 import (
-	"log"
 	"strings"
 
+	"github.com/AdguardTeam/golibs/log"
 	"golang.org/x/sys/windows"
 	"golang.org/x/sys/windows/svc/eventlog"
 )

diff --git a/internal/util/auto_hosts.go → internal/util/autohosts.go b/internal/util/auto_hosts.go → internal/util/autohosts.go
diff --git a/internal/util/auto_hosts_test.go → internal/util/autohosts_test.go b/internal/util/auto_hosts_test.go → internal/util/autohosts_test.go
diff --git a/internal/util/helpers.go b/internal/util/helpers.go
@@ -9,7 +9,6 @@ import (
 	"io/ioutil"
 	"os"
 	"os/exec"
-	"path"
 	"runtime"
 	"strings"
 )
@@ -41,13 +40,6 @@ func RunCommand(command string, arguments ...string) (int, string, error) {
 	return cmd.ProcessState.ExitCode(), string(out), nil
 }
 
-func FuncName() string {
-	pc := make([]uintptr, 10) // at least 1 entry needed
-	runtime.Callers(2, pc)
-	f := runtime.FuncForPC(pc[0])
-	return path.Base(f.Name())
-}
-
 // SplitNext - split string by a byte and return the first chunk
 // Skip empty chunks
 // Whitespace is trimmed

diff --git a/internal/util/network_utils.go → internal/util/network.go b/internal/util/network_utils.go → internal/util/network.go
diff --git a/internal/util/network_utils_test.go → internal/util/network_test.go b/internal/util/network_utils_test.go → internal/util/network_test.go
@@ -1,7 +1,6 @@
 package util
 
 import (
-	"log"
 	"testing"
 )
 
@@ -19,6 +18,6 @@ func TestGetValidNetInterfacesForWeb(t *testing.T) {
 			t.Fatalf("No addresses found for %s", iface.Name)
 		}
 
-		log.Printf("%v", iface)
+		t.Logf("%v", iface)
 	}
 }