bitswap: make use of default broadcast delay on initialization

ipfs · Nov 22, 2023 · 9999444 · 9999444
1 parent 11e43b9
commit 9999444
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/bitswap/client/client.go b/bitswap/client/client.go
@@ -175,7 +175,7 @@ func New(parent context.Context, network bsnet.BitSwapNetwork, bstore blockstore
 		dupMetric:                  bmetrics.DupHist(ctx),
 		allMetric:                  bmetrics.AllHist(ctx),
 		provSearchDelay:            defaults.ProvSearchDelay,
-		rebroadcastDelay:           delay.Fixed(time.Minute),
+		rebroadcastDelay:           delay.Fixed(defaults.RebroadcastDelay),
 		simulateDontHavesOnTimeout: true,
 	}
 

diff --git a/bitswap/internal/defaults/defaults.go b/bitswap/internal/defaults/defaults.go
@@ -3,8 +3,6 @@ package defaults
 import (
 	"encoding/binary"
 	"time"
-
-	delay "github.com/ipfs/go-ipfs-delay"
 )
 
 const (
@@ -35,10 +33,8 @@ const (
 	// FIXME: expose this in go-verifcid.
 	MaximumHashLength = 128
 	MaximumAllowedCid = binary.MaxVarintLen64*4 + MaximumHashLength
-)
 
-var (
 	// RebroadcastDelay is the default delay to trigger broadcast of
 	// random CIDs in the wantlist.
-	RebroadcastDelay = delay.Fixed(time.Minute)
+	RebroadcastDelay = time.Minute
 )