p2p: remove unused code (#16158)

* p2p: remove unused code

* p2p: remove unused imports
pull/16121/merge
Ivan Daniluk 7 years ago committed by Péter Szilágyi
parent 4535247793
commit 8522b31221
  1. 26
      p2p/message.go
  2. 4
      p2p/server.go

@ -22,8 +22,6 @@ import (
"fmt" "fmt"
"io" "io"
"io/ioutil" "io/ioutil"
"net"
"sync"
"sync/atomic" "sync/atomic"
"time" "time"
@ -112,30 +110,6 @@ func SendItems(w MsgWriter, msgcode uint64, elems ...interface{}) error {
return Send(w, msgcode, elems) return Send(w, msgcode, elems)
} }
// netWrapper wraps a MsgReadWriter with locks around
// ReadMsg/WriteMsg and applies read/write deadlines.
type netWrapper struct {
rmu, wmu sync.Mutex
rtimeout, wtimeout time.Duration
conn net.Conn
wrapped MsgReadWriter
}
func (rw *netWrapper) ReadMsg() (Msg, error) {
rw.rmu.Lock()
defer rw.rmu.Unlock()
rw.conn.SetReadDeadline(time.Now().Add(rw.rtimeout))
return rw.wrapped.ReadMsg()
}
func (rw *netWrapper) WriteMsg(msg Msg) error {
rw.wmu.Lock()
defer rw.wmu.Unlock()
rw.conn.SetWriteDeadline(time.Now().Add(rw.wtimeout))
return rw.wrapped.WriteMsg(msg)
}
// eofSignal wraps a reader with eof signaling. the eof channel is // eofSignal wraps a reader with eof signaling. the eof channel is
// closed when the wrapped reader returns an error or when count bytes // closed when the wrapped reader returns an error or when count bytes
// have been read. // have been read.

@ -36,9 +36,7 @@ import (
) )
const ( const (
defaultDialTimeout = 15 * time.Second defaultDialTimeout = 15 * time.Second
refreshPeersInterval = 30 * time.Second
staticPeerCheckInterval = 15 * time.Second
// Connectivity defaults. // Connectivity defaults.
maxActiveDialTasks = 16 maxActiveDialTasks = 16

Loading…
Cancel
Save