DeadlineSettable -> DeadlineSettableConn

agreement/fuzzer/networkFacade_test.go

@@ -348,7 +348,7 @@ func (n *NetworkFacade) ReceiveMessage(sourceNode int, tag protocol.Tag, data []
 	n.pushPendingReceivedMessage()
 }
 
-func (n *NetworkFacade) Disconnect(sender network.DisconnectablePeer) {
+func (n *NetworkFacade) Disconnect(sender network.DeadlineSettableConn) {
 	sourceNode := n.peerToNode[sender.(*facadePeer)]
 	n.fuzzer.Disconnect(n.nodeID, sourceNode)
 }

agreement/gossip/network_test.go

@@ -135,7 +135,7 @@ func (w *whiteholeNetwork) Relay(ctx context.Context, tag protocol.Tag, data []b
 func (w *whiteholeNetwork) BroadcastSimple(tag protocol.Tag, data []byte) error {
 	return w.Broadcast(context.Background(), tag, data, true, nil)
 }
-func (w *whiteholeNetwork) Disconnect(badnode network.DisconnectablePeer) {
+func (w *whiteholeNetwork) Disconnect(badnode network.DeadlineSettableConn) {
 	return
 }
 func (w *whiteholeNetwork) DisconnectPeers() {

components/mocks/mockNetwork.go

@@ -60,7 +60,7 @@ func (network *MockNetwork) RequestConnectOutgoing(replace bool, quit <-chan str
 }
 
 // Disconnect - unused function
-func (network *MockNetwork) Disconnect(badpeer network.DisconnectablePeer) {
+func (network *MockNetwork) Disconnect(badpeer network.DeadlineSettableConn) {
 }
 
 // DisconnectPeers - unused function

data/txHandler.go

@@ -597,7 +597,7 @@ func (handler *TxHandler) dedupCanonical(unverifiedTxGroup []transactions.Signed
 // - the key used for insertion if the message was not found in the cache
 // - the capacity guard returned by the elastic rate limiter
 // - a boolean indicating if the message was a duplicate or the sender is rate limited
-func (handler *TxHandler) incomingMsgDupErlCheck(data []byte, sender network.DisconnectablePeer) (*crypto.Digest, *util.ErlCapacityGuard, bool) {
+func (handler *TxHandler) incomingMsgDupErlCheck(data []byte, sender network.DeadlineSettableConn) (*crypto.Digest, *util.ErlCapacityGuard, bool) {
 	var msgKey *crypto.Digest
 	var capguard *util.ErlCapacityGuard
 	var isDup bool
@@ -681,7 +681,7 @@ func decodeMsg(data []byte) (unverifiedTxGroup []transactions.SignedTxn, consume
 // incomingTxGroupDupRateLimit checks
 // - if the incoming transaction group has been seen before after reencoding to canonical representation, and
 // - if the sender is rate limited by the per-application rate limiter.
-func (handler *TxHandler) incomingTxGroupDupRateLimit(unverifiedTxGroup []transactions.SignedTxn, encodedExpectedSize int, sender network.DisconnectablePeer) (*crypto.Digest, bool) {
+func (handler *TxHandler) incomingTxGroupDupRateLimit(unverifiedTxGroup []transactions.SignedTxn, encodedExpectedSize int, sender network.DeadlineSettableConn) (*crypto.Digest, bool) {
 	var canonicalKey *crypto.Digest
 	if handler.txCanonicalCache != nil {
 		var isDup bool

network/connPerfMon_test.go

@@ -48,7 +48,7 @@ func makeMsgPool(N int, peers []Peer) (out []IncomingMessage) {
 
 		addMsg := func(msgCount int) {
 			for i := 0; i < msgCount; i++ {
-				msg.Sender = peers[(int(msgIndex)+i)%len(peers)].(DisconnectablePeer)
+				msg.Sender = peers[(int(msgIndex)+i)%len(peers)].(DeadlineSettableConn)
 				timer += int64(7 * time.Nanosecond)
 				msg.Received = timer
 				out = append(out, msg)

network/gossipNode.go

@@ -29,8 +29,8 @@ import (
 // Peer opaque interface for referring to a neighbor in the network
 type Peer interface{}
 
-// DisconnectablePeer is a Peer with a long-living connection to a network that can be disconnected
-type DisconnectablePeer interface {
+// DeadlineSettableConn is a Peer with a long-living connection to a network that can be disconnected
+type DeadlineSettableConn interface {
 	GetNetwork() GossipNode
 }
 
@@ -62,7 +62,7 @@ type GossipNode interface {
 	Address() (string, bool)
 	Broadcast(ctx context.Context, tag protocol.Tag, data []byte, wait bool, except Peer) error
 	Relay(ctx context.Context, tag protocol.Tag, data []byte, wait bool, except Peer) error
-	Disconnect(badnode DisconnectablePeer)
+	Disconnect(badnode DeadlineSettableConn)
 	DisconnectPeers() // only used by testing
 
 	// RegisterHTTPHandler path accepts gorilla/mux path annotations
@@ -127,7 +127,7 @@ var outgoingMessagesBufferSize = int(
 
 // IncomingMessage represents a message arriving from some peer in our p2p network
 type IncomingMessage struct {
-	Sender DisconnectablePeer
+	Sender DeadlineSettableConn
 	Tag    Tag
 	Data   []byte
 	Err    error

network/hybridNetwork.go

@@ -115,7 +115,7 @@ func (n *HybridP2PNetwork) Relay(ctx context.Context, tag protocol.Tag, data []b
 }
 
 // Disconnect implements GossipNode
-func (n *HybridP2PNetwork) Disconnect(badnode DisconnectablePeer) {
+func (n *HybridP2PNetwork) Disconnect(badnode DeadlineSettableConn) {
 	net := badnode.GetNetwork()
 	if net == n.p2pNetwork {
 		n.p2pNetwork.Disconnect(badnode)
@@ -180,13 +180,13 @@ func (n *HybridP2PNetwork) ClearHandlers() {
 	n.wsNetwork.ClearHandlers()
 }
 
-// RegisterProcessors adds to the set of given message handlers.
+// RegisterProcessors adds to the set of given message processors.
 func (n *HybridP2PNetwork) RegisterProcessors(dispatch []TaggedMessageProcessor) {
 	n.p2pNetwork.RegisterProcessors(dispatch)
 	n.wsNetwork.RegisterProcessors(dispatch)
 }
 
-// ClearProcessors deregisters all the existing message handlers.
+// ClearProcessors deregisters all the existing message processors.
 func (n *HybridP2PNetwork) ClearProcessors() {
 	n.p2pNetwork.ClearProcessors()
 	n.wsNetwork.ClearProcessors()

network/p2pNetwork.go

@@ -527,7 +527,7 @@ func (n *P2PNetwork) Relay(ctx context.Context, tag protocol.Tag, data []byte, w
 }
 
 // Disconnect from a peer, probably due to protocol errors.
-func (n *P2PNetwork) Disconnect(badpeer DisconnectablePeer) {
+func (n *P2PNetwork) Disconnect(badpeer DeadlineSettableConn) {
 	var peerID peer.ID
 	var wsp *wsPeer
 
@@ -555,7 +555,7 @@ func (n *P2PNetwork) Disconnect(badpeer DisconnectablePeer) {
 	}
 }
 
-func (n *P2PNetwork) disconnectThread(badnode DisconnectablePeer, reason disconnectReason) {
+func (n *P2PNetwork) disconnectThread(badnode DeadlineSettableConn, reason disconnectReason) {
 	defer n.wg.Done()
 	n.Disconnect(badnode) // ignores reason
 }

network/wsNetwork.go

@@ -362,7 +362,7 @@ type networkPeerManager interface {
 
 	// used by msgHandler
 	Broadcast(ctx context.Context, tag protocol.Tag, data []byte, wait bool, except Peer) error
-	disconnectThread(badnode DisconnectablePeer, reason disconnectReason)
+	disconnectThread(badnode DeadlineSettableConn, reason disconnectReason)
 	checkPeersConnectivity()
 }
 
@@ -477,13 +477,13 @@ func (wn *WebsocketNetwork) RelayArray(ctx context.Context, tags []protocol.Tag,
 	return nil
 }
 
-func (wn *WebsocketNetwork) disconnectThread(badnode DisconnectablePeer, reason disconnectReason) {
+func (wn *WebsocketNetwork) disconnectThread(badnode DeadlineSettableConn, reason disconnectReason) {
 	defer wn.wg.Done()
 	wn.disconnect(badnode, reason)
 }
 
 // Disconnect from a peer, probably due to protocol errors.
-func (wn *WebsocketNetwork) Disconnect(node DisconnectablePeer) {
+func (wn *WebsocketNetwork) Disconnect(node DeadlineSettableConn) {
 	wn.disconnect(node, disconnectBadData)
 }