apply suggestions

Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>

Author: vgonkivs

api/rpc_test.go

@@ -28,6 +28,7 @@ import (
 	daMock "github.com/celestiaorg/celestia-node/nodebuilder/da/mocks"
 	"github.com/celestiaorg/celestia-node/nodebuilder/das"
 	dasMock "github.com/celestiaorg/celestia-node/nodebuilder/das/mocks"
+	"github.com/celestiaorg/celestia-node/nodebuilder/fibre"
 	"github.com/celestiaorg/celestia-node/nodebuilder/fraud"
 	fraudMock "github.com/celestiaorg/celestia-node/nodebuilder/fraud/mocks"
 	"github.com/celestiaorg/celestia-node/nodebuilder/header"
@@ -138,6 +139,7 @@ type api struct {
 	Blob       blob.Module
 	DA         da.Module //nolint: staticcheck
 	Blobstream blobstream.Module
+	Fibre      fibre.Module
 }
 
 func TestModulesImplementFullAPI(t *testing.T) {

blob/service.go

@@ -221,9 +221,8 @@ func (s *Service) SubmitFibreBlob(
 	ns libshare.Namespace,
 	data []byte,
 	txConfig *SubmitOptions,
-) (*fibre.SubmitResult, error) {
+) (_ *fibre.SubmitResult, err error) {
 	ctx, span := tracer.Start(ctx, "blob/submit-fibre")
-	var err error
 	defer func() {
 		utils.SetStatusAndEnd(span, err)
 		if err != nil {
@@ -241,7 +240,8 @@ func (s *Service) SubmitFibreBlob(
 	log.Infow("submitting fibre blob", "namespace", ns.String(), "data-size", len(data))
 	result, err := s.fibreSubmitter.Submit(ctx, ns, data, txConfig)
 	if err != nil {
-		return nil, fmt.Errorf("fibre submit: %w", err)
+		err = fmt.Errorf("fibre submit: %w", err)
+		return nil, err
 	}
 
 	log.Debugw("fibre blob submitted", "namespace", ns.String(), "height", result.Height, "tx-hash", result.TxHash)

nodebuilder/blob/module.go

@@ -25,30 +25,28 @@ func ConstructModule() fx.Option {
 				return service.Subscribe
 			},
 		),
-		fx.Provide(fx.Annotate(
-			func(
-				state state.Module,
-				sGetter shwap.Getter,
-				getByHeightFn func(context.Context, uint64) (*header.ExtendedHeader, error),
-				subscribeFn func(context.Context) (<-chan *header.ExtendedHeader, error),
-				params struct {
-					fx.In
-					fibreClient *fibre.Client `optional:"true"`
-				},
-			) *blob.Service {
-				var fibreSubmitter blob.FibreSubmitter
-				if params.fibreClient != nil {
-					fibreSubmitter = params.fibreClient
-				}
-				return blob.NewService(state, fibreSubmitter, sGetter, getByHeightFn, subscribeFn)
+		fx.Provide(func(
+			state state.Module,
+			sGetter shwap.Getter,
+			getByHeightFn func(context.Context, uint64) (*header.ExtendedHeader, error),
+			subscribeFn func(context.Context) (<-chan *header.ExtendedHeader, error),
+			params struct {
+				fx.In
+				FibreClient *fibre.Client `optional:"true"`
 			},
-			fx.OnStart(func(ctx context.Context, serv *blob.Service) error {
-				return serv.Start(ctx)
-			}),
-			fx.OnStop(func(ctx context.Context, serv *blob.Service) error {
-				return serv.Stop(ctx)
-			}),
-		)),
+		) *blob.Service {
+			var fibreSubmitter blob.FibreSubmitter
+			if params.FibreClient != nil {
+				fibreSubmitter = params.FibreClient
+			}
+			return blob.NewService(state, fibreSubmitter, sGetter, getByHeightFn, subscribeFn)
+		}),
+		fx.Invoke(func(lc fx.Lifecycle, serv *blob.Service) {
+			lc.Append(fx.Hook{
+				OnStart: serv.Start,
+				OnStop:  serv.Stop,
+			})
+		}),
 		fx.Provide(func(serv *blob.Service) Module {
 			return serv
 		}),

state/txclient/fibre.go

@@ -2,7 +2,6 @@ package txclient
 
 import (
 	"context"
-	"errors"
 	"fmt"
 
 	appfibre "github.com/celestiaorg/celestia-app/v8/fibre"
@@ -22,6 +21,14 @@ func (c *TxClient) Upload(
 	if err != nil {
 		return appfibre.SignedPaymentPromise{}, err
 	}
+	return c.upload(ctx, ns, blob)
+}
+
+func (c *TxClient) upload(
+	ctx context.Context,
+	ns libshare.Namespace,
+	blob *appfibre.Blob,
+) (appfibre.SignedPaymentPromise, error) {
 	return c.fibreClient.Upload(ctx, ns, blob)
 }
 
@@ -40,7 +47,7 @@ func (c *TxClient) Submit(
 		return nil, nil, err
 	}
 
-	promise, err := c.Upload(ctx, ns, data)
+	promise, err := c.upload(ctx, ns, blob)
 	if err != nil {
 		return nil, nil, err
 	}
@@ -52,7 +59,7 @@ func (c *TxClient) Submit(
 
 	signer, err := c.getTxAuthorAccAddress(cfg)
 	if err != nil {
-		return nil, nil, errors.New("can't get signer address")
+		return nil, nil, fmt.Errorf("getting signer address: %w", err)
 	}
 
 	msg := &types.MsgPayForFibre{

state/txclient/tx_client.go

@@ -126,17 +126,19 @@ func setupEstimatorConnection(ctx context.Context, addr string, tlsEnabled bool)
 func (c *TxClient) Stop(ctx context.Context) error {
 	c.cancel()
 
+	c.fibreClientLk.Lock()
+	defer c.fibreClientLk.Unlock()
 	if c.fibreClient != nil {
 		if err := c.fibreClient.Stop(ctx); err != nil {
-			return err
+			log.Warnw("failed to stop fibre client", "err", err)
 		}
 		c.fibreClient = nil
 	}
 
 	if c.estimatorConn != nil {
 		err := c.estimatorConn.Close()
 		if err != nil {
-			return err
+			log.Warnw("failed to close estimator connection", "err", err)
 		}
 		c.estimatorConn = nil
 	}