fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-11 04:11:21 +00:00
Code Issues Projects Releases Wiki Activity

p2p: sw.AddPeer -> sw.addPeer

Browse Source
This commit is contained in:
Ethan Buchman
2017-09-21 15:33:22 -04:00
parent 8ff5b365dd
commit b50339e8e7
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
p2p/switch.go
View File

@ -209,11 +209,11 @@ func (sw *Switch) OnStop() {
} }
} }
// AddPeer checks the given peer's validity, performs a handshake, and adds the peer to the switch // addPeer checks the given peer's validity, performs a handshake, and adds the peer to the switch
// and to all registered reactors. // and to all registered reactors.
// NOTE: This performs a blocking handshake before the peer is added. // NOTE: This performs a blocking handshake before the peer is added.
// CONTRACT: If error is returned, peer is nil, and conn is immediately closed. // CONTRACT: If error is returned, peer is nil, and conn is immediately closed.
func (sw *Switch) AddPeer(peer *peer) error { func (sw *Switch) addPeer(peer *peer) error {
if err := sw.FilterConnByAddr(peer.Addr()); err != nil { if err := sw.FilterConnByAddr(peer.Addr()); err != nil {
return err return err
@ -336,7 +336,7 @@ func (sw *Switch) dialSeed(addr *NetAddress) {
} }
} }
// DialPeerWithAddress dials the given peer and runs sw.AddPeer if it connects successfully. // DialPeerWithAddress dials the given peer and runs sw.addPeer if it connects successfully.
// If `persistent == true`, the switch will always try to reconnect to this peer if the connection ever fails. // If `persistent == true`, the switch will always try to reconnect to this peer if the connection ever fails.
func (sw *Switch) DialPeerWithAddress(addr *NetAddress, persistent bool) (Peer, error) { func (sw *Switch) DialPeerWithAddress(addr *NetAddress, persistent bool) (Peer, error) {
sw.dialing.Set(addr.IP.String(), addr) sw.dialing.Set(addr.IP.String(), addr)
@ -352,7 +352,7 @@ func (sw *Switch) DialPeerWithAddress(addr *NetAddress, persistent bool) (Peer,
if persistent { if persistent {
peer.makePersistent() peer.makePersistent()
} }
err = sw.AddPeer(peer) err = sw.addPeer(peer)
if err != nil { if err != nil {
sw.Logger.Error("Failed to add peer", "address", addr, "err", err) sw.Logger.Error("Failed to add peer", "address", addr, "err", err)
peer.CloseConn() peer.CloseConn()
@ -582,7 +582,7 @@ func (sw *Switch) addPeerWithConnection(conn net.Conn) error {
return err return err
} }
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err = sw.AddPeer(peer); err != nil { if err = sw.addPeer(peer); err != nil {
conn.Close() conn.Close()
return err return err
} }
@ -597,7 +597,7 @@ func (sw *Switch) addPeerWithConnectionAndConfig(conn net.Conn, config *PeerConf
return err return err
} }
peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr())) peer.SetLogger(sw.Logger.With("peer", conn.RemoteAddr()))
if err = sw.AddPeer(peer); err != nil { if err = sw.addPeer(peer); err != nil {
conn.Close() conn.Close()
return err return err
} }

4
p2p/switch_test.go
View File

@ -246,7 +246,7 @@ func TestSwitchStopsNonPersistentPeerOnError(t *testing.T) {
peer, err := newOutboundPeer(rp.Addr(), sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, DefaultPeerConfig()) peer, err := newOutboundPeer(rp.Addr(), sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, DefaultPeerConfig())
require.Nil(err) require.Nil(err)
err = sw.AddPeer(peer) err = sw.addPeer(peer)
require.Nil(err) require.Nil(err)
// simulate failure by closing connection // simulate failure by closing connection
@ -273,7 +273,7 @@ func TestSwitchReconnectsToPersistentPeer(t *testing.T) {
peer, err := newOutboundPeer(rp.Addr(), sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, DefaultPeerConfig()) peer, err := newOutboundPeer(rp.Addr(), sw.reactorsByCh, sw.chDescs, sw.StopPeerForError, sw.nodePrivKey, DefaultPeerConfig())
peer.makePersistent() peer.makePersistent()
require.Nil(err) require.Nil(err)
err = sw.AddPeer(peer) err = sw.addPeer(peer)
require.Nil(err) require.Nil(err)
// simulate failure by closing connection // simulate failure by closing connection