Rename Network to Prefix

To more closely match net/netip. Also, it may reduce confusion with
Networks and NetworksWithin, which refer to more than just the network.

Author: oschwald

example_test.go

@@ -72,7 +72,7 @@ func ExampleReader_Networks() {
 		if err != nil {
 			log.Panic(err)
 		}
-		fmt.Printf("%s: %s\n", result.Network(), record.Domain)
+		fmt.Printf("%s: %s\n", result.Prefix(), record.Domain)
 	}
 	// Output:
 	// 1.0.0.0/24: Cable/DSL
@@ -123,7 +123,7 @@ func ExampleReader_NetworksWithin() {
 		if err != nil {
 			log.Panic(err)
 		}
-		fmt.Printf("%s: %s\n", result.Network(), record.Domain)
+		fmt.Printf("%s: %s\n", result.Prefix(), record.Domain)
 	}
 
 	// Output:

reader_test.go

@@ -201,7 +201,7 @@ func TestLookupNetwork(t *testing.T) {
 			result := reader.Lookup(test.IP)
 			require.NoError(t, result.Err())
 			assert.Equal(t, test.ExpectedFound, result.Found())
-			assert.Equal(t, test.ExpectedNetwork, result.Network().String())
+			assert.Equal(t, test.ExpectedNetwork, result.Prefix().String())
 
 			require.NoError(t, result.Decode(&record))
 			assert.Equal(t, test.ExpectedRecord, record)
@@ -841,7 +841,7 @@ func BenchmarkLookupNetwork(b *testing.B) {
 		if err := res.Err(); err != nil {
 			b.Error(err)
 		}
-		if !res.Network().IsValid() {
+		if !res.Prefix().IsValid() {
 			b.Fatalf("invalid network for %s", ip)
 		}
 	}

result.go

@@ -118,9 +118,9 @@ func (r Result) Offset() uintptr {
 	return uintptr(r.offset)
 }
 
-// Network returns the netip.Prefix representing the network associated with
+// Prefix returns the netip.Prefix representing the network associated with
 // the data record in the database.
-func (r Result) Network() netip.Prefix {
+func (r Result) Prefix() netip.Prefix {
 	ip := r.ip
 	prefixLen := int(r.prefixLen)
 

traverse.go

@@ -146,7 +146,7 @@ func (r *Reader) NetworksWithin(prefix netip.Prefix, options ...NetworksOption)
 						prefixLen: uint8(node.bit),
 					}
 					res.err = newInvalidDatabaseError(
-						"invalid search tree at %s", res.Network())
+						"invalid search tree at %s", res.Prefix())
 
 					yield(res)
 

traverse_test.go

@@ -27,7 +27,7 @@ func TestNetworks(t *testing.T) {
 				err := result.Decode(&record)
 				require.NoError(t, err)
 
-				network := result.Network()
+				network := result.Prefix()
 				assert.Equal(t, record.IP, network.Addr().String(),
 					"expected %s got %s", record.IP, network.Addr().String(),
 				)
@@ -294,7 +294,7 @@ func TestNetworksWithin(t *testing.T) {
 					}{}
 					err := result.Decode(&record)
 					require.NoError(t, err)
-					innerIPs = append(innerIPs, result.Network().String())
+					innerIPs = append(innerIPs, result.Prefix().String())
 				}
 
 				assert.Equal(t, v.Expected, innerIPs)
@@ -333,7 +333,7 @@ func TestGeoIPNetworksWithin(t *testing.T) {
 			}{}
 			err := result.Decode(&record)
 			require.NoError(t, err)
-			innerIPs = append(innerIPs, result.Network().String())
+			innerIPs = append(innerIPs, result.Prefix().String())
 		}
 
 		assert.Equal(t, v.Expected, innerIPs)