Pull request: all: less annoying pkg names

Merge in DNS/adguard-home from imp-naming to master

Squashed commit of the following:

commit d9e75c37af9a738384393735c141a41406d22eeb
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date:   Thu May 13 15:52:14 2021 +0300

    all: less annoying pkg names
This commit is contained in:
Ainar Garipov
2021-05-21 16:15:47 +03:00
parent 42ec9cae76
commit 7f2f8de922
40 changed files with 207 additions and 207 deletions

View File

@@ -9,7 +9,7 @@ import (
"time"
"github.com/AdguardTeam/AdGuardHome/internal/aghtest"
"github.com/AdguardTeam/AdGuardHome/internal/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/internal/filtering"
"github.com/AdguardTeam/dnsproxy/proxyutil"
"github.com/miekg/dns"
"github.com/stretchr/testify/assert"
@@ -267,11 +267,11 @@ func addEntry(l *queryLog, host string, answerStr, client net.IP) {
A: answerStr,
}},
}
res := dnsfilter.Result{
res := filtering.Result{
IsFiltered: true,
Reason: dnsfilter.Rewritten,
Reason: filtering.Rewritten,
ServiceName: "SomeService",
Rules: []*dnsfilter.ResultRule{{
Rules: []*filtering.ResultRule{{
FilterListID: 1,
Text: "SomeRule",
}},