Merge neighbors package up to the main presence package

neighbors/arp.go → arp.go

@@ -1,14 +1,12 @@
-package neighbors
+package presence
 
 import (
 	"context"
-
-	"douglasthrift.net/presence"
 )
 
 type (
 	Interfaces         map[string]bool
-	HardwareAddrStates map[string]presence.State
+	HardwareAddrStates map[string]State
 
 	ARP interface {
 		Present(ctx context.Context, ifs Interfaces, addrs HardwareAddrStates) (bool, error)

neighbors/arp_freebsd.go → arp_freebsd.go

@@ -1,4 +1,4 @@
-package neighbors
+package presence
 
 import (
 	"context"

neighbors/arp_linux.go → arp_linux.go

@@ -1,4 +1,4 @@
-package neighbors
+package presence
 
 import (
 	"context"

neighbors/arping.go → arping.go

@@ -1,4 +1,4 @@
-package neighbors
+package presence
 
 import (
 	"bufio"

cmd/presence/main.go

@@ -6,18 +6,17 @@ import (
 	"os"
 
 	"douglasthrift.net/presence"
-	"douglasthrift.net/presence/neighbors"
 )
 
 func main() {
-	ifs := neighbors.Interfaces{os.Args[1]: true}
-	hws := make(neighbors.HardwareAddrStates, len(os.Args[2:]))
+	ifs := presence.Interfaces{os.Args[1]: true}
+	hws := make(presence.HardwareAddrStates, len(os.Args[2:]))
 	for _, hw := range os.Args[2:] {
 		hws[hw] = presence.NewState()
 	}
 
 	ctx := context.Background()
-	a, err := neighbors.NewARP(1)
+	a, err := presence.NewARP(1)
 	if err != nil {
 		log.Fatal(err)
 	}