Improving option name and make consistent

CHANGELOG.md

@@ -17,7 +17,7 @@ The following emojis are used to highlight certain changes:
 ### Added
 
 * `boxo/bitswap/server`:
-  * A new `WithReplaceHasWithBlockMaxSize(n)` option can be used with `bitswap.New`. It sets the maximum size of a block in bytes up to which we will replace a want-have with a want-block. Setting a size of 0 disables this want-have replacement and means that block sizes are not read for want-have requests.
+  * A new `WithWantHaveReplaceSize(n)` option can be used with `bitswap.New`. It sets the maximum size of a block in bytes up to which the bitswap server will replace a WantHave with a WantBlock response. Setting this to 0 disables this WantHave replacement and means that block sizes are not read when processing WantHave requests.
 
 ### Changed
 

bitswap/options.go

@@ -71,12 +71,12 @@ func WithTaskComparator(comparator server.TaskComparator) Option {
 	return Option{server.WithTaskComparator(comparator)}
 }
 
-// WithReplaceHasWithBlockMaxSize sets the maximum size of a block in bytes up
-// to which we will replace a want-have with a want-block. Setting a size of 0
-// disables this want-have replacement and means that block sizes are not read
-// for want-have requests.
-func WithReplaceHasWithBlockMaxSize(maxSize int) Option {
-	return Option{server.WithReplaceHasWithBlockMaxSize(maxSize)}
+// WithWantHaveReplaceSize sets the maximum size of a block in bytes up to
+// which the bitswap server will replace a WantHave with a WantBlock response.
+// Setting this to 0 disables this WantHave replacement and means that block
+// sizes are not read when processing WantHave requests.
+func WithWantHaveReplaceSize(size int) Option {
+	return Option{server.WithWantHaveReplaceSize(size)}
 }
 
 func ProviderSearchDelay(newProvSearchDelay time.Duration) Option {

bitswap/server/internal/decision/engine.go

@@ -78,9 +78,9 @@ const (
 	// on their behalf.
 	queuedTagWeight = 10
 
-	// defaultReplaceHasWithBlockMaxSize is the default maximum size of the
-	// block in bytes up to which we will replace a want-have with a want-block
-	defaultReplaceHasWithBlockMaxSize = 1024
+	// defaultWantHave ReplaceSize is the default maximum size of the block in
+	// bytes up to which we will replace a WantHave with a WantBlock response.
+	defaultWantHaveReplaceSize = 1024
 )
 
 // Envelope contains a message for a Peer.
@@ -202,9 +202,9 @@ type Engine struct {
 
 	targetMessageSize int
 
-	// replaceHasWithBlockMaxSize is the maximum size of the block in
-	// bytes up to which we will replace a want-have with a want-block
-	replaceHasWithBlockMaxSize int
+	// wantHaveReplaceSize is the maximum size of the block in bytes up to
+	// which to replace a WantHave with a WantBlock.
+	wantHaveReplaceSize int
 
 	sendDontHaves bool
 
@@ -343,11 +343,11 @@ func WithSetSendDontHave(send bool) Option {
 	}
 }
 
-// WithReplaceHasWithBlockMaxSize sets the maximum size of a block in bytes up
-// to which we will replace a want-have with a want-block.
-func WithReplaceHasWithBlockMaxSize(maxSize int) Option {
+// WithWantHaveReplaceSize sets the maximum size of a block in bytes up to
+// which to replace a WantHave with a WantBlock response.
+func WithWantHaveReplaceSize(size int) Option {
 	return func(e *Engine) {
-		e.replaceHasWithBlockMaxSize = maxSize
+		e.wantHaveReplaceSize = size
 	}
 }
 
@@ -394,7 +394,7 @@ func NewEngine(
 		outbox:                          make(chan (<-chan *Envelope), outboxChanBuffer),
 		workSignal:                      make(chan struct{}, 1),
 		ticker:                          time.NewTicker(time.Millisecond * 100),
-		replaceHasWithBlockMaxSize:      defaultReplaceHasWithBlockMaxSize,
+		wantHaveReplaceSize:             defaultWantHaveReplaceSize,
 		taskWorkerCount:                 defaults.BitswapEngineTaskWorkerCount,
 		sendDontHaves:                   true,
 		self:                            self,
@@ -435,10 +435,10 @@ func NewEngine(
 
 	e.peerRequestQueue = peertaskqueue.New(peerTaskQueueOpts...)
 
-	if e.replaceHasWithBlockMaxSize == 0 {
+	if e.wantHaveReplaceSize == 0 {
 		log.Info("Replace WantHave with WantBlock is disabled")
 	} else {
-		log.Infow("Replace WantHave with WantBlock is enabled", "maxSize", e.replaceHasWithBlockMaxSize)
+		log.Infow("Replace WantHave with WantBlock is enabled", "maxSize", e.wantHaveReplaceSize)
 	}
 
 	return e
@@ -685,7 +685,7 @@ func (e *Engine) MessageReceived(ctx context.Context, p peer.ID, m bsmsg.BitSwap
 		return true
 	}
 
-	noReplace := e.replaceHasWithBlockMaxSize == 0
+	noReplace := e.wantHaveReplaceSize == 0
 
 	// Get block sizes for unique CIDs.
 	wantKs := make([]cid.Cid, 0, len(wants))
@@ -1084,7 +1084,7 @@ func (e *Engine) PeerDisconnected(p peer.ID) {
 // If the want is a want-have, and it's below a certain size, send the full
 // block (instead of sending a HAVE)
 func (e *Engine) sendAsBlock(wantType pb.Message_Wantlist_WantType, blockSize int) bool {
-	return wantType == pb.Message_Wantlist_Block || blockSize <= e.replaceHasWithBlockMaxSize
+	return wantType == pb.Message_Wantlist_Block || blockSize <= e.wantHaveReplaceSize
 }
 
 func (e *Engine) numBytesSentTo(p peer.ID) uint64 {

bitswap/server/internal/decision/engine_test.go

@@ -188,10 +188,10 @@ func newEngineForTesting(
 	bs blockstore.Blockstore,
 	peerTagger PeerTagger,
 	self peer.ID,
-	maxReplaceSize int,
+	wantHaveReplaceSize int,
 	opts ...Option,
 ) *Engine {
-	opts = append(opts, WithReplaceHasWithBlockMaxSize(maxReplaceSize))
+	opts = append(opts, WithWantHaveReplaceSize(wantHaveReplaceSize))
 	return NewEngine(ctx, bs, peerTagger, self, opts...)
 }
 

bitswap/server/server.go

@@ -251,16 +251,16 @@ func HasBlockBufferSize(count int) Option {
 	}
 }
 
-// WithReplaceHasWithBlockMaxSize sets the maximum size of a block in bytes up
-// to which we will replace a want-have with a want-block. Setting a size of 0
-// disables this want-have replacement and means that block sizes are not read
-// for want-have requests.
-func WithReplaceHasWithBlockMaxSize(maxSize int) Option {
-	if maxSize < 0 {
-		maxSize = 0
+// WithWantHaveReplaceSize sets the maximum size of a block in bytes up to
+// which to replace a WantHave with a WantBlock. Setting to 0 disables this
+// WantHave replacement and means that block sizes are not read when processing
+// WantHave requests.
+func WithWantHaveReplaceSize(size int) Option {
+	if size < 0 {
+		size = 0
 	}
 	return func(bs *Server) {
-		bs.engineOptions = append(bs.engineOptions, decision.WithReplaceHasWithBlockMaxSize(maxSize))
+		bs.engineOptions = append(bs.engineOptions, decision.WithWantHaveReplaceSize(size))
 	}
 }