refactor: move ConnectionMaker and related types

router/connection_maker.go

@@ -21,6 +21,25 @@ const (
 	CMStatus     = iota
 )
 
+type ConnectionMaker struct {
+	router         *Router
+	targets        map[string]*Target
+	cmdLineAddress map[string]bool
+	queryChan      chan<- *ConnectionMakerInteraction
+}
+
+// Information about an address where we may find a peer
+type Target struct {
+	attempting  bool          // are we currently attempting to connect there?
+	tryAfter    time.Time     // next time to try this address
+	tryInterval time.Duration // backoff time on next failure
+}
+
+type ConnectionMakerInteraction struct {
+	Interaction
+	address string
+}
+
 func StartConnectionMaker(router *Router) *ConnectionMaker {
 	queryChan := make(chan *ConnectionMakerInteraction, ChannelSize)
 	state := &ConnectionMaker{

router/types.go

@@ -150,25 +150,6 @@ type Interaction struct {
 	resultChan chan<- interface{}
 }
 
-type ConnectionMakerInteraction struct {
-	Interaction
-	address string
-}
-
-type ConnectionMaker struct {
-	router         *Router
-	queryChan      chan<- *ConnectionMakerInteraction
-	targets        map[string]*Target
-	cmdLineAddress map[string]bool
-}
-
-// Information about an address where we may find a peer
-type Target struct {
-	attempting  bool          // are we currently attempting to connect there?
-	tryAfter    time.Time     // next time to try this address
-	tryInterval time.Duration // backoff time on next failure
-}
-
 // UDPSender interface and implementations
 
 type UDPSender interface {