Merge pull request #958 from KeefeL/keefe/bugfix

[R4R] p2p: define DiscReason as uint8

p2p/peer.go

@@ -337,11 +337,11 @@ func (p *Peer) handle(msg Msg) error {
  SendItems(p.rw, pongMsg)
  })
  case msg.Code == discMsg:
- var reason [1]DiscReason
  // This is the last message. We don't need to discard or
  // check errors because, the connection will be closed after it.
- rlp.Decode(msg.Payload, &reason)
- return reason[0]
+ var m struct{ R DiscReason }
+ rlp.Decode(msg.Payload, &m)
+ return m.R
  case msg.Code < baseProtocolLength:
  // ignore other base protocol messages
  return msg.Discard()

p2p/peer_error.go

@@ -54,7 +54,7 @@ func (pe *peerError) Error() string {
 
 var errProtocolReturned = errors.New("protocol returned")
 
-type DiscReason uint
+type DiscReason uint8
 
 const (
  DiscRequested DiscReason = iota