fix: make timer operations work with golang 1.23

CHANGELOG.md

@@ -29,6 +29,8 @@ The following emojis are used to highlight certain changes:
 
 ### Fixed
 
+- Handle timers appropriately for go 1.23 while still being compatible with previous versions.
+
 ### Security
 
 ## [v0.22.0]

gateway/backend_car_traversal.go

@@ -81,7 +81,7 @@ func carToLinearBlockGetter(ctx context.Context, reader io.Reader, timeout time.
 		var ok bool
 		select {
 		case blkRead, ok = <-blkCh:
-			if !t.Stop() {
+			if cap(t.C) == 1 && !t.Stop() {
 				<-t.C
 			}
 			t.Reset(timeout)

mfs/repub.go

@@ -98,14 +98,10 @@
 //
 // Note: If a publish fails, we retry repeatedly every TimeoutRetry.
 func (rp *Republisher) Run(lastPublished cid.Cid) {
-	quick := time.NewTimer(0)
-	if !quick.Stop() {
-		<-quick.C
-	}
-	longer := time.NewTimer(0)
-	if !longer.Stop() {
-		<-longer.C
-	}
+	quick := time.NewTimer(time.Hour)
+	quick.Stop()
+	longer := time.NewTimer(time.Hour)
+	longer.Stop()
 
 	var toPublish cid.Cid
 	for rp.ctx.Err() == nil {
@@ -156,15 +152,19 @@
 		//    idiom as these timers may not be running.
 
 		quick.Stop()
-		select {
-		case <-quick.C:
-		default:
-		}
-
 		longer.Stop()
-		select {
-		case <-longer.C:
-		default:
+
+		// If using go < 1.23, clear timer channel after Stop.
+		if cap(quick.C) == 1 {
+			select {
+			case <-quick.C:
+			default:
+			}
+
+			select {
+			case <-longer.C:
+			default:
+			}
 		}
 
 		// 2. If we have a value to publish, publish it now.

provider/reprovider.go

@@ -418,8 +418,9 @@ func (s *reprovider) run() {
 	}()
 }
 
+// TODO: When go 1.23+ is required, replace this with t.Stop().
 func stopAndEmptyTimer(t *time.Timer) {
-	if !t.Stop() {
+	if !t.Stop() && cap(t.C) == 1 {
 		<-t.C
 	}
 }