home: imp code

internal/home/dns.go

@@ -473,7 +473,7 @@ func applyAdditionalFiltering(clientIP net.IP, clientID string, setts *filtering
 
 	if c.UseOwnBlockedServices {
 		// TODO(e.burkov):  Get rid of this crutch.
-		setts.ServicesRules = []filtering.ServiceEntry{}
+		setts.ServicesRules = nil
 		svcs := c.BlockedServices
 		Context.filters.ApplyBlockedServicesList(setts, svcs)
 		log.Debug("%s: services for client %q set: %s", pref, c.Name, svcs)

internal/home/dns_internal_test.go

@@ -9,20 +9,20 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func TestApplyAdditionalFiltering(t *testing.T) {
+func TestApplyAdditionalFiltering_blockedServices(t *testing.T) {
 	filtering.InitModule()
 
 	var (
-		globalIDs = []string{"ok"}
-		clientIDs = []string{"ok", "mail_ru", "vk"}
+		globalBlockedServices = []string{"ok"}
+		clientBlockedServices = []string{"ok", "mail_ru", "vk"}
 
 		err error
 	)
 
 	Context.filters, err = filtering.New(&filtering.Config{
 		BlockedServices: &filtering.BlockedServices{
 			Schedule: schedule.EmptyWeekly(),
-			IDs:      globalIDs,
+			IDs:      globalBlockedServices,
 		},
 	}, nil)
 	require.NoError(t, err)
@@ -35,7 +35,7 @@ func TestApplyAdditionalFiltering(t *testing.T) {
 			UseOwnBlockedServices: true,
 		},
 		"client_3": {
-			BlockedServices:       clientIDs,
+			BlockedServices:       clientBlockedServices,
 			UseOwnBlockedServices: true,
 		},
 	}
@@ -49,15 +49,15 @@ func TestApplyAdditionalFiltering(t *testing.T) {
 	}{{
 		name:    "global_settings",
 		id:      "client_1",
-		wantLen: len(globalIDs),
+		wantLen: len(globalBlockedServices),
 	}, {
 		name:    "custom_settings",
 		id:      "client_2",
 		wantLen: 0,
 	}, {
 		name:    "custom_settings_block",
 		id:      "client_3",
-		wantLen: len(clientIDs),
+		wantLen: len(clientBlockedServices),
 	}}
 
 	for _, tc := range testCases {