WIP: Introduce PeerConnManager to manage peer connections

.golangci.yml

@@ -90,6 +90,7 @@ linters-settings:
     ignored-numbers:
       - '0666'
       - '0755'
+      - "2" # ignore two as we want to easily double things.
 
     # List of function patterns to exclude from analysis.
     # Values always ignored: `time.Date`

chanrestore.go

@@ -1,6 +1,7 @@
 package lnd
 
 import (
+	"errors"
 	"fmt"
 	"math"
 	"net"
@@ -13,6 +14,7 @@ import (
 	"github.com/lightningnetwork/lnd/contractcourt"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnwire"
+	"github.com/lightningnetwork/lnd/peerconn"
 	"github.com/lightningnetwork/lnd/shachain"
 )
 
@@ -304,7 +306,7 @@ func (s *server) ConnectPeer(nodePub *btcec.PublicKey, addrs []net.Addr) error {
 	// Before we connect to the remote peer, we'll remove any connections
 	// to ensure the new connection is created after this new link/channel
 	// is known.
-	if err := s.DisconnectPeer(nodePub); err != nil {
+	if err := s.pcm.DisconnectPeer(nodePub); err != nil {
 		ltndLog.Infof("Peer(%v) is already connected, proceeding "+
 			"with chan restore", nodePub.SerializeCompressed())
 	}
@@ -324,13 +326,15 @@ func (s *server) ConnectPeer(nodePub *btcec.PublicKey, addrs []net.Addr) error {
 		// Attempt to connect to the peer using this full address. If
 		// we're unable to connect to them, then we'll try the next
 		// address in place of it.
-		err := s.ConnectToPeer(netAddr, true, s.cfg.ConnectionTimeout)
+		err := s.pcm.ConnectToPeer(
+			netAddr, true, s.cfg.ConnectionTimeout,
+		)
 
 		// If we're already connected to this peer, then we don't
 		// consider this an error, so we'll exit here.
-		if _, ok := err.(*errPeerAlreadyConnected); ok {
+		targetErr := &peerconn.ErrPeerAlreadyConnected{}
+		if errors.As(err, &targetErr) {
 			return nil
-
 		} else if err != nil {
 			// Otherwise, something else happened, so we'll try the
 			// next address.

peer/brontide.go

@@ -186,7 +186,7 @@ type Config struct {
 
 	// Switch is a pointer to the htlcswitch. It is used to setup, get, and
 	// tear-down ChannelLinks.
-	Switch messageSwitch
+	Switch MessageSwitch
 
 	// InterceptSwitch is a pointer to the InterceptableSwitch, a wrapper around
 	// the regular Switch. We only export it here to pass ForwardPackets to the

peer/interfaces.go

@@ -9,9 +9,9 @@ import (
 	"github.com/lightningnetwork/lnd/lnwire"
 )
 
-// messageSwitch is an interface that abstracts managing the lifecycle of
+// MessageSwitch is an interface that abstracts managing the lifecycle of
 // abstract links. This is intended for peer package usage only.
-type messageSwitch interface {
+type MessageSwitch interface {
 	// BestHeight returns the best height known to the messageSwitch.
 	BestHeight() uint32