forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 17:33:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

p2p: Rename MsgEventer to msgEventer

Browse source 
Signed-off-by: Lewis Marshall <lewis@lmars.net>
This commit is contained in:
Lewis Marshall 2017-09-15 22:56:28 +01:00
parent bb37a4af47
commit cd12a9efdd
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
p2p/message.go
View file

@ -274,9 +274,9 @@ func ExpectMsg(r MsgReader, code uint64, content interface{}) error {
return nil return nil
} }
// MsgEventer wraps a MsgReadWriter and sends events whenever a message is sent // msgEventer wraps a MsgReadWriter and sends events whenever a message is sent
// or received // or received
type MsgEventer struct { type msgEventer struct {
MsgReadWriter MsgReadWriter
feed *event.Feed feed *event.Feed
@ -284,10 +284,10 @@ type MsgEventer struct {
Protocol string Protocol string
} }
// NewMsgEventer returns a MsgEventer which sends message events to the given // newMsgEventer returns a msgEventer which sends message events to the given
// feed // feed
func NewMsgEventer(rw MsgReadWriter, feed *event.Feed, peerID discover.NodeID, proto string) *MsgEventer { func newMsgEventer(rw MsgReadWriter, feed *event.Feed, peerID discover.NodeID, proto string) *msgEventer {
return &MsgEventer{ return &msgEventer{
MsgReadWriter: rw, MsgReadWriter: rw,
feed: feed, feed: feed,
peerID: peerID, peerID: peerID,
@ -297,7 +297,7 @@ func NewMsgEventer(rw MsgReadWriter, feed *event.Feed, peerID discover.NodeID, p
// ReadMsg reads a message from the underlying MsgReadWriter and emits a // ReadMsg reads a message from the underlying MsgReadWriter and emits a
// "message received" event // "message received" event
func (self *MsgEventer) ReadMsg() (Msg, error) { func (self *msgEventer) ReadMsg() (Msg, error) {
msg, err := self.MsgReadWriter.ReadMsg() msg, err := self.MsgReadWriter.ReadMsg()
if err != nil { if err != nil {
return msg, err return msg, err
@ -314,7 +314,7 @@ func (self *MsgEventer) ReadMsg() (Msg, error) {
// WriteMsg writes a message to the underlying MsgReadWriter and emits a // WriteMsg writes a message to the underlying MsgReadWriter and emits a
// "message sent" event // "message sent" event
func (self *MsgEventer) WriteMsg(msg Msg) error { func (self *msgEventer) WriteMsg(msg Msg) error {
err := self.MsgReadWriter.WriteMsg(msg) err := self.MsgReadWriter.WriteMsg(msg)
if err != nil { if err != nil {
return err return err
@ -331,7 +331,7 @@ func (self *MsgEventer) WriteMsg(msg Msg) error {
// Close closes the underlying MsgReadWriter if it implements the io.Closer // Close closes the underlying MsgReadWriter if it implements the io.Closer
// interface // interface
func (self *MsgEventer) Close() error { func (self *msgEventer) Close() error {
if v, ok := self.MsgReadWriter.(io.Closer); ok { if v, ok := self.MsgReadWriter.(io.Closer); ok {
return v.Close() return v.Close()
} }

2
p2p/peer.go
View file

@ -335,7 +335,7 @@ func (p *Peer) startProtocols(writeStart <-chan struct{}, writeErr chan<- error)
proto.werr = writeErr proto.werr = writeErr
var rw MsgReadWriter = proto var rw MsgReadWriter = proto
if p.events != nil { if p.events != nil {
rw = NewMsgEventer(rw, p.events, p.ID(), proto.Name) rw = newMsgEventer(rw, p.events, p.ID(), proto.Name)
} }
p.log.Trace(fmt.Sprintf("Starting protocol %s/%d", proto.Name, proto.Version)) p.log.Trace(fmt.Sprintf("Starting protocol %s/%d", proto.Name, proto.Version))
go func() { go func() {