contractor: cleanup PR

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)
+			}
 		}
 	}
 

autopilot/ipfilter.go

@@ -37,18 +37,19 @@ var (
 type (
 	ipFilter struct {
 		subnetToHostKey map[string]string
-		resolver        *ipResolver
 
-		logger *zap.SugaredLogger
+		resolver *ipResolver
+		logger   *zap.SugaredLogger
 	}
 )
 
 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,
 	}
 }