highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-09-01 18:27:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

server: change PeerNotFound to PeerNotConnected

Browse Source
This commit is contained in:
Sean Erle Johnson
2018-04-15 13:19:15 -07:00
committed by Olaoluwa Osuntokun
parent 005510b54f
commit 938d367232
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
server.go
View File

@@ -37,9 +37,9 @@ import (
) )
var ( var (
// ErrPeerNotFound signals that the server has no connection to the // ErrPeerNotConnected signals that the server has no connection to the
// given peer. // given peer.
ErrPeerNotFound = errors.New("unable to find peer") ErrPeerNotConnected = errors.New("peer is not connected")
// ErrServerShuttingDown indicates that the server is in the process of // ErrServerShuttingDown indicates that the server is in the process of
// gracefully exiting. // gracefully exiting.
@@ -1124,9 +1124,9 @@ func (s *server) sendToPeer(target *btcec.PublicKey,
// here to ensure we consider the exact set of peers present at the // here to ensure we consider the exact set of peers present at the
// time of invocation. // time of invocation.
targetPeer, err := s.findPeerByPubStr(string(targetPubBytes)) targetPeer, err := s.findPeerByPubStr(string(targetPubBytes))
if err == ErrPeerNotFound { if err == ErrPeerNotConnected {
srvrLog.Errorf("unable to send message to %x, "+ srvrLog.Errorf("unable to send message to %x, "+
"peer not found", targetPubBytes) "peer is not connected", targetPubBytes)
return nil, nil, err return nil, nil, err
} }
@@ -1210,7 +1210,7 @@ func (s *server) FindPeerByPubStr(pubStr string) (*peer, error) {
func (s *server) findPeerByPubStr(pubStr string) (*peer, error) { func (s *server) findPeerByPubStr(pubStr string) (*peer, error) {
peer, ok := s.peersByPub[pubStr] peer, ok := s.peersByPub[pubStr]
if !ok { if !ok {
return nil, ErrPeerNotFound return nil, ErrPeerNotConnected
} }
return peer, nil return peer, nil
@@ -1467,7 +1467,7 @@ func (s *server) InboundPeerConnected(conn net.Conn) {
// from findPeerByPubStr. // from findPeerByPubStr.
connectedPeer, err := s.findPeerByPubStr(pubStr) connectedPeer, err := s.findPeerByPubStr(pubStr)
switch err { switch err {
case ErrPeerNotFound: case ErrPeerNotConnected:
// We were unable to locate an existing connection with the // We were unable to locate an existing connection with the
// target peer, proceed to connect. // target peer, proceed to connect.
@@ -1557,7 +1557,7 @@ func (s *server) OutboundPeerConnected(connReq *connmgr.ConnReq, conn net.Conn)
// findPeerByPubStr. // findPeerByPubStr.
connectedPeer, err := s.findPeerByPubStr(pubStr) connectedPeer, err := s.findPeerByPubStr(pubStr)
switch err { switch err {
case ErrPeerNotFound: case ErrPeerNotConnected:
// We were unable to locate an existing connection with the // We were unable to locate an existing connection with the
// target peer, proceed to connect. // target peer, proceed to connect.
@@ -1843,8 +1843,8 @@ func (s *server) DisconnectPeer(pubKey *btcec.PublicKey) error {
// exit in an error as we can't disconnect from a peer that we're not // exit in an error as we can't disconnect from a peer that we're not
// currently connected to. // currently connected to.
peer, err := s.findPeerByPubStr(pubStr) peer, err := s.findPeerByPubStr(pubStr)
if err == ErrPeerNotFound { if err == ErrPeerNotConnected {
return fmt.Errorf("unable to find peer %x", pubBytes) return fmt.Errorf("peer %x is not connected", pubBytes)
} }
srvrLog.Infof("Disconnecting from %v", peer) srvrLog.Infof("Disconnecting from %v", peer)
@@ -1900,7 +1900,7 @@ func (s *server) OpenChannel(nodeKey *btcec.PublicKey,
s.mu.RUnlock() s.mu.RUnlock()
if targetPeer == nil { if targetPeer == nil {
errChan <- fmt.Errorf("unable to find peer NodeKey(%x)", pubKeyBytes) errChan <- fmt.Errorf("peer is not connected NodeKey(%x)", pubKeyBytes)
return updateChan, errChan return updateChan, errChan
} }