From 102393e50e89e528b53fe9edee070f853fb52adb Mon Sep 17 00:00:00 2001
From: PJ <peterjan.brone@gmail.com>
Date: Wed, 4 Oct 2023 17:29:54 +0200
Subject: [PATCH] contractor: cleanup PR

---
 autopilot/contractor.go | 13 +++++++------
 autopilot/ipfilter.go   |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/autopilot/contractor.go b/autopilot/contractor.go
index 34220488c..f013fcf9e 100644
--- a/autopilot/contractor.go
+++ b/autopilot/contractor.go
@@ -126,11 +126,10 @@ type (
 )
 
 func newContractor(ap *Autopilot, revisionSubmissionBuffer uint64, revisionBroadcastInterval time.Duration) *contractor {
-	logger := ap.logger.Named("contractor")
 	return &contractor{
 		ap:                        ap,
-		resolver:                  newIPResolver(resolverLookupTimeout, logger),
-		logger:                    logger,
+		resolver:                  newIPResolver(resolverLookupTimeout, ap.logger.Named("resolver")),
+		logger:                    ap.logger.Named("contractor"),
 		revisionBroadcastInterval: revisionBroadcastInterval,
 		revisionLastBroadcast:     make(map[types.FileContractID]time.Time),
 		revisionSubmissionBuffer:  revisionSubmissionBuffer,
@@ -818,9 +817,11 @@ func (c *contractor) runContractFormations(ctx context.Context, w Worker, hosts
 
 	// prepare an IP filter that contains all used hosts
 	ipFilter := c.newIPFilter()
-	for _, h := range hosts {
-		if _, used := usedHosts[h.PublicKey]; used {
-			_ = ipFilter.IsRedundantIP(h.NetAddress, h.PublicKey)
+	if shouldFilter {
+		for _, h := range hosts {
+			if _, used := usedHosts[h.PublicKey]; used {
+				_ = ipFilter.IsRedundantIP(h.NetAddress, h.PublicKey)
+			}
 		}
 	}
 
diff --git a/autopilot/ipfilter.go b/autopilot/ipfilter.go
index be34d7699..559fa986f 100644
--- a/autopilot/ipfilter.go
+++ b/autopilot/ipfilter.go
@@ -37,9 +37,9 @@ var (
 type (
 	ipFilter struct {
 		subnetToHostKey map[string]string
-		resolver        *ipResolver
 
-		logger *zap.SugaredLogger
+		resolver *ipResolver
+		logger   *zap.SugaredLogger
 	}
 )
 
@@ -47,8 +47,9 @@ func (c *contractor) newIPFilter() *ipFilter {
 	c.resolver.pruneCache()
 	return &ipFilter{
 		subnetToHostKey: make(map[string]string),
-		resolver:        c.resolver,
-		logger:          c.logger,
+
+		resolver: c.resolver,
+		logger:   c.logger,
 	}
 }