Implemented PR 24507 from go-ethereum

EthereumCommonwealth · Mar 23, 2023 · 8575793 · 8575793
1 parent 8fe39df
commit 8575793
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/p2p/peer.go b/p2p/peer.go
@@ -324,11 +324,11 @@ func (p *Peer) handle(msg Msg) error {
 		msg.Discard()
 		go 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()

diff --git a/p2p/peer_error.go b/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