Skip to content

Commit

Permalink
p2p: define DiscReason as uint8 (#24507)
Browse files Browse the repository at this point in the history
All other implementations store disconnect reasons as a single byte,
so go-ethereum should do it too.
  • Loading branch information
fjl authored and NashBC committed Jun 22, 2022
1 parent 8537153 commit 4b8c03b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions p2p/peer.go
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 1 addition & 1 deletion p2p/peer_error.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 4b8c03b

Please sign in to comment.