Fix idle peers with eth68

jonastheis · omerfirmak · commit 22122170a41b · 2024-08-06T10:47:12.000+03:00
diff --git a/eth/downloader/peer.go b/eth/downloader/peer.go
@@ -413,7 +413,7 @@ func (ps *peerSet) HeaderIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.BlockHeadersMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // BodyIdlePeers retrieves a flat list of all the currently body-idle peers within
@@ -425,7 +425,7 @@ func (ps *peerSet) BodyIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.BlockBodiesMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // ReceiptIdlePeers retrieves a flat list of all the currently receipt-idle peers
@@ -437,7 +437,7 @@ func (ps *peerSet) ReceiptIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.ReceiptsMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // NodeDataIdlePeers retrieves a flat list of all the currently node-data-idle
@@ -449,7 +449,7 @@ func (ps *peerSet) NodeDataIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.NodeDataMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // idlePeers retrieves a flat list of all currently idle peers satisfying the
diff --git a/les/downloader/peer.go b/les/downloader/peer.go
@@ -413,7 +413,7 @@ func (ps *peerSet) HeaderIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.BlockHeadersMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // BodyIdlePeers retrieves a flat list of all the currently body-idle peers within
@@ -425,7 +425,7 @@ func (ps *peerSet) BodyIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.BlockBodiesMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // ReceiptIdlePeers retrieves a flat list of all the currently receipt-idle peers
@@ -437,7 +437,7 @@ func (ps *peerSet) ReceiptIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.ReceiptsMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // NodeDataIdlePeers retrieves a flat list of all the currently node-data-idle
@@ -449,7 +449,7 @@ func (ps *peerSet) NodeDataIdlePeers() ([]*peerConnection, int) {
 	throughput := func(p *peerConnection) int {
 		return p.rates.Capacity(eth.NodeDataMsg, time.Second)
 	}
-	return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)
+	return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)
 }
 
 // idlePeers retrieves a flat list of all currently idle peers satisfying the

Original file line number	Diff line number	Diff line change
`@@ -413,7 +413,7 @@ func (ps peerSet) HeaderIdlePeers() ([]peerConnection, int) {`
`413`	`413`	`throughput := func(p *peerConnection) int {`
`414`	`414`	`return p.rates.Capacity(eth.BlockHeadersMsg, time.Second)`
`415`	`415`	`}`
`416`		`- return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)`
	`416`	`+ return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`// BodyIdlePeers retrieves a flat list of all the currently body-idle peers within`
`@@ -425,7 +425,7 @@ func (ps peerSet) BodyIdlePeers() ([]peerConnection, int) {`
`425`	`425`	`throughput := func(p *peerConnection) int {`
`426`	`426`	`return p.rates.Capacity(eth.BlockBodiesMsg, time.Second)`
`427`	`427`	`}`
`428`		`- return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)`
	`428`	`+ return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)`
`429`	`429`	`}`
`430`	`430`
`431`	`431`	`// ReceiptIdlePeers retrieves a flat list of all the currently receipt-idle peers`
`@@ -437,7 +437,7 @@ func (ps peerSet) ReceiptIdlePeers() ([]peerConnection, int) {`
`437`	`437`	`throughput := func(p *peerConnection) int {`
`438`	`438`	`return p.rates.Capacity(eth.ReceiptsMsg, time.Second)`
`439`	`439`	`}`
`440`		`- return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)`
	`440`	`+ return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`// NodeDataIdlePeers retrieves a flat list of all the currently node-data-idle`
`@@ -449,7 +449,7 @@ func (ps peerSet) NodeDataIdlePeers() ([]peerConnection, int) {`
`449`	`449`	`throughput := func(p *peerConnection) int {`
`450`	`450`	`return p.rates.Capacity(eth.NodeDataMsg, time.Second)`
`451`	`451`	`}`
`452`		`- return ps.idlePeers(eth.ETH66, eth.ETH66, idle, throughput)`
	`452`	`+ return ps.idlePeers(eth.ETH66, eth.ETH68, idle, throughput)`
`453`	`453`	`}`
`454`	`454`
`455`	`455`	`// idlePeers retrieves a flat list of all currently idle peers satisfying the`