From 31985f1ea02b88fb6a53137f9fd2cd21188a7394 Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 26 Oct 2021 15:03:04 +1100
Subject: [PATCH] Add Peer.mustRequest
---
peerconn.go | 8 ++++++++
requesting.go | 5 +----
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/peerconn.go b/peerconn.go
index c7a4e8cf..91ef37e6 100644
--- a/peerconn.go
+++ b/peerconn.go
@@ -585,6 +585,14 @@ func (cn *Peer) shouldRequest(r RequestIndex) error {
return nil
}
+func (cn *Peer) mustRequest(r RequestIndex) bool {
+ more, err := cn.request(r)
+ if err != nil {
+ panic(err)
+ }
+ return more
+}
+
func (cn *Peer) request(r RequestIndex) (more bool, err error) {
if err := cn.shouldRequest(r); err != nil {
panic(err)
diff --git a/requesting.go b/requesting.go
index 462d6818..adb1c51a 100644
--- a/requesting.go
+++ b/requesting.go
@@ -304,10 +304,7 @@ func (p *Peer) applyRequestState(next requestState) bool {
//)
break
}
- more, err = p.request(req)
- if err != nil {
- panic(err)
- }
+ more = p.mustRequest(req)
if !more {
break
}
--
2.51.0