From: Matt Joiner <anacrolix@gmail.com>
Date: Tue, 26 Oct 2021 04:03:04 +0000 (+1100)
Subject: Add Peer.mustRequest
X-Git-Tag: v1.34.0^2~1
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=31985f1ea02b88fb6a53137f9fd2cd21188a7394;p=btrtrc.git

Add Peer.mustRequest
---

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
 		}