From 203fe4d1d948bf35297589a6ac9959a0faf838bd Mon Sep 17 00:00:00 2001
From: Matt Joiner <anacrolix@gmail.com>
Date: Mon, 14 Jul 2025 15:36:08 +1000
Subject: [PATCH] Remove rate limit test

It's old and too hard to update to new Read implementation
---
 ratelimitreader.go |  11 +---
 rlreader_test.go   | 128 ---------------------------------------------
 2 files changed, 1 insertion(+), 138 deletions(-)
 delete mode 100644 rlreader_test.go

diff --git a/ratelimitreader.go b/ratelimitreader.go
index f1af3125..63a56176 100644
--- a/ratelimitreader.go
+++ b/ratelimitreader.go
@@ -11,15 +11,6 @@ import (
 type rateLimitedReader struct {
 	l *rate.Limiter
 	r io.Reader
-
-	// This is the time of the last Read's reservation.
-	lastRead time.Time
-}
-
-func (me *rateLimitedReader) justRead(b []byte) (n int, err error) {
-	n, err = me.r.Read(b)
-	me.lastRead = time.Now()
-	return
 }
 
 func (me *rateLimitedReader) Read(b []byte) (n int, err error) {
@@ -27,7 +18,7 @@ func (me *rateLimitedReader) Read(b []byte) (n int, err error) {
 		b = b[:min(len(b), me.l.Burst())]
 	}
 	t := time.Now()
-	n, err = me.justRead(b)
+	n, err = me.r.Read(b)
 	r := me.l.ReserveN(t, n)
 	panicif.False(r.OK())
 	time.Sleep(r.DelayFrom(t))
diff --git a/rlreader_test.go b/rlreader_test.go
deleted file mode 100644
index 6bf25c43..00000000
--- a/rlreader_test.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package torrent
-
-import (
-	"io"
-	"log"
-	"math/rand"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/time/rate"
-)
-
-func writeN(ws []io.Writer, n int) error {
-	b := make([]byte, n)
-	for _, w := range ws[1:] {
-		n1 := rand.Intn(n)
-		wn, err := w.Write(b[:n1])
-		if wn != n1 {
-			if err == nil {
-				panic(n1)
-			}
-			return err
-		}
-		n -= n1
-	}
-	wn, err := ws[0].Write(b[:n])
-	if wn != n {
-		if err == nil {
-			panic(n)
-		}
-	}
-	return err
-}
-
-func TestRateLimitReaders(t *testing.T) {
-	const (
-		numReaders     = 2
-		bytesPerSecond = 100
-		burst          = 5
-		readSize       = 6
-		writeRounds    = 10
-		bytesPerRound  = 12
-	)
-	control := rate.NewLimiter(bytesPerSecond, burst)
-	shared := rate.NewLimiter(bytesPerSecond, burst)
-	var (
-		ws []io.Writer
-		cs []io.Closer
-	)
-	wg := sync.WaitGroup{}
-	type read struct {
-		N int
-		// When the read was allowed.
-		At time.Time
-	}
-	reads := make(chan read)
-	done := make(chan struct{})
-	for i := 0; i < numReaders; i += 1 {
-		r, w := io.Pipe()
-		ws = append(ws, w)
-		cs = append(cs, w)
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			r := rateLimitedReader{
-				l: shared,
-				r: r,
-			}
-			b := make([]byte, readSize)
-			for {
-				n, err := r.Read(b)
-				select {
-				case reads <- read{n, r.lastRead}:
-				case <-done:
-					return
-				}
-				if err == io.EOF {
-					return
-				}
-				if err != nil {
-					panic(err)
-				}
-			}
-		}()
-	}
-	closeAll := func() {
-		for _, c := range cs {
-			c.Close()
-		}
-	}
-	defer func() {
-		close(done)
-		closeAll()
-		wg.Wait()
-	}()
-	written := 0
-	go func() {
-		for i := 0; i < writeRounds; i += 1 {
-			err := writeN(ws, bytesPerRound)
-			if err != nil {
-				log.Printf("error writing: %s", err)
-				break
-			}
-			written += bytesPerRound
-		}
-		closeAll()
-		wg.Wait()
-		close(reads)
-	}()
-	totalBytesRead := 0
-	started := time.Now()
-	for r := range reads {
-		totalBytesRead += r.N
-		require.False(t, r.At.IsZero())
-		// Copy what the reader should have done with its reservation.
-		res := control.ReserveN(r.At, r.N)
-		// If we don't have to wait with the control, the reader has gone too
-		// fast.
-		if res.Delay() > 0 {
-			log.Printf("%d bytes not allowed at %s", r.N, time.Since(started))
-			t.FailNow()
-		}
-	}
-	assert.EqualValues(t, writeRounds*bytesPerRound, totalBytesRead)
-}
-- 
2.51.0