remove obsolete explicit IP whitelisting in favor of subnets

score.go

@@ -338,14 +338,9 @@ func (ps *peerScore) ipColocationFactor(p peer.ID) float64 {
 	var result float64
 loop:
 	for _, ip := range pstats.ips {
-		_, whitelisted := ps.params.IPColocationFactorWhitelist[ip]
+		if len(ps.params.IPColocationFactorWhitelist) > 0 {
-		if whitelisted {
-			continue
-		}
-
-		if len(ps.params.IPColocationFactorWhitelistSubnets) > 0 {
 			ipObj := net.ParseIP(ip)
-			for _, ipNet := range ps.params.IPColocationFactorWhitelistSubnets {
+			for _, ipNet := range ps.params.IPColocationFactorWhitelist {
 				if ipNet.Contains(ipObj) {
 					continue loop
 				}

score_params.go

@@ -70,10 +70,9 @@ type PeerScoreParams struct {
 	// The weight of the parameter MUST be negative, unless you want to disable for testing.
 	// Note: In order to simulate many IPs in a managable manner when testing, you can set the weight to 0
 	//       thus disabling the IP colocation penalty.
-	IPColocationFactorWeight           float64
+	IPColocationFactorWeight    float64
-	IPColocationFactorThreshold        int
+	IPColocationFactorThreshold int
-	IPColocationFactorWhitelist        map[string]struct{}
+	IPColocationFactorWhitelist []*net.IPNet
-	IPColocationFactorWhitelistSubnets []*net.IPNet
 
 	// P7: behavioural pattern penalties.
 	// This parameter has an associated counter which tracks misbehaviour as detected by the

score_test.go

@@ -743,7 +743,7 @@ func TestScoreIPColocation(t *testing.T) {
 	}
 }
 
-func TestScoreIPColocationWhitelistSubnet(t *testing.T) {
+func TestScoreIPColocationWhitelist(t *testing.T) {
 	// Create parameters with reasonable default values
 	mytopic := "mytopic"
 
@@ -753,11 +753,11 @@ func TestScoreIPColocationWhitelistSubnet(t *testing.T) {
 	}
 
 	params := &PeerScoreParams{
-		AppSpecificScore:                   func(peer.ID) float64 { return 0 },
+		AppSpecificScore:            func(peer.ID) float64 { return 0 },
-		IPColocationFactorThreshold:        1,
+		IPColocationFactorThreshold: 1,
-		IPColocationFactorWeight:           -1,
+		IPColocationFactorWeight:    -1,
-		IPColocationFactorWhitelistSubnets: []*net.IPNet{ipNet},
+		IPColocationFactorWhitelist: []*net.IPNet{ipNet},
-		Topics:                             make(map[string]*TopicScoreParams),
+		Topics:                      make(map[string]*TopicScoreParams),
 	}
 
 	peerA := peer.ID("A")