Cleanup

Signed-off-by: Jakub Sztandera <kubuxu@protocol.ai>

chain/blocksync/blocksync_client.go

@@ -253,7 +253,6 @@ func (bs *BlockSync) sendRequestToPeer(ctx context.Context, p peer.ID, req *Bloc
 
 	var res BlockSyncResponse
 	r := incrt.New(s, 50<<10, 5*time.Second)
-
 	if err := cborutil.ReadCborRPC(bufio.NewReader(r), &res); err != nil {
 		bs.syncPeers.logFailure(p, time.Since(start))
 		return nil, err

lib/increadtimeout/incrt.go

@@ -35,28 +35,39 @@ func New(rd ReaderDeadline, minSpeed int64, maxWait time.Duration) io.Reader {
 	}
 }
 
-func (crt *incrt) Read(buf []byte) (n int, err error) {
+type errNoWait struct{}
+
+func (err errNoWait) Error() string {
+	return "wait time exceeded"
+}
+func (err errNoWait) Timeout() bool {
+	return true
+}
+
+func (crt *incrt) Read(buf []byte) (int, error) {
 	start := now()
-	err = crt.rd.SetReadDeadline(start.Add(crt.wait))
+	if crt.wait == 0 {
-	if err != nil {
+		return 0, errNoWait{}
-		return 0, err
 	}
 
-	defer func() {
+	err := crt.rd.SetReadDeadline(start.Add(crt.wait))
-		crt.rd.SetReadDeadline(time.Time{})
+	if err != nil {
-		if err == nil {
+		log.Warn("unable to set daedline")
-			dur := now().Sub(start)
+	}
-			crt.wait -= dur
-			crt.wait += time.Duration(n) * crt.waitPerByte
-			if crt.wait < 0 {
-				crt.wait = 0
-			}
-			if crt.wait > crt.maxWait {
-				crt.wait = crt.maxWait
-			}
-		}
-	}()
 
-	n, err = crt.rd.Read(buf)
+	n, err := crt.rd.Read(buf)
+
+	crt.rd.SetReadDeadline(time.Time{})
+	if err == nil {
+		dur := now().Sub(start)
+		crt.wait -= dur
+		crt.wait += time.Duration(n) * crt.waitPerByte
+		if crt.wait < 0 {
+			crt.wait = 0
+		}
+		if crt.wait > crt.maxWait {
+			crt.wait = crt.maxWait
+		}
+	}
 	return n, err
 }