fix(share/shwap/p2p/shrex): defer stream close in doRequest (#4596)

renaynay · web-flow · commit ff02e2c3841a · 2025-09-26T12:43:34.000Z
diff --git a/share/shwap/p2p/shrex/client.go b/share/shwap/p2p/shrex/client.go
@@ -14,6 +14,7 @@ import (
 
 	"github.com/celestiaorg/go-libp2p-messenger/serde"
 
+	"github.com/celestiaorg/celestia-node/libs/utils"
 	shrexpb "github.com/celestiaorg/celestia-node/share/shwap/p2p/shrex/pb"
 )
 
@@ -84,6 +85,9 @@ func (c *Client) doRequest(
 	if err != nil {
 		return statusOpenStreamErr, fmt.Errorf("open stream: %w", err)
 	}
+	defer func() {
+		utils.CloseAndLog(log, "shrex/client stream", stream)
+	}()
 
 	c.setStreamDeadlines(ctx, logger, stream)
 

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ import (`
`14`	`14`
`15`	`15`	`"github.com/celestiaorg/go-libp2p-messenger/serde"`
`16`	`16`
	`17`	`+ "github.com/celestiaorg/celestia-node/libs/utils"`
`17`	`18`	`shrexpb "github.com/celestiaorg/celestia-node/share/shwap/p2p/shrex/pb"`
`18`	`19`	`)`
`19`	`20`
`@@ -84,6 +85,9 @@ func (c *Client) doRequest(`
`84`	`85`	`if err != nil {`
`85`	`86`	`return statusOpenStreamErr, fmt.Errorf("open stream: %w", err)`
`86`	`87`	`}`
	`88`	`+ defer func() {`
	`89`	`+ utils.CloseAndLog(log, "shrex/client stream", stream)`
	`90`	`+ }()`
`87`	`91`
`88`	`92`	`c.setStreamDeadlines(ctx, logger, stream)`
`89`	`93`