integrating into fx

Makefile

@@ -166,7 +166,7 @@ pb-gen:
 ## openrpc-gen: Generate OpenRPC spec for Celestia-Node's RPC api
 openrpc-gen:
 	@echo "--> Generating OpenRPC spec"
-	@go run ./cmd/docgen fraud header state share das p2p node blob
+	@go run ./cmd/docgen fraud header state share das p2p node blob da
 .PHONY: openrpc-gen
 
 ## lint-imports: Lint only Go imports.

api/rpc/client/client.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/celestiaorg/celestia-node/api/rpc/perms"
 	"github.com/celestiaorg/celestia-node/nodebuilder/blob"
+	"github.com/celestiaorg/celestia-node/nodebuilder/da"
 	"github.com/celestiaorg/celestia-node/nodebuilder/das"
 	"github.com/celestiaorg/celestia-node/nodebuilder/fraud"
 	"github.com/celestiaorg/celestia-node/nodebuilder/header"
@@ -33,6 +34,7 @@ type Client struct {
 	P2P    p2p.API
 	Node   node.API
 	Blob   blob.API
+	DA     da.API
 
 	closer multiClientCloser
 }
@@ -91,5 +93,6 @@ func moduleMap(client *Client) map[string]interface{} {
 		"p2p":    &client.P2P.Internal,
 		"node":   &client.Node.Internal,
 		"blob":   &client.Blob.Internal,
+		"da":     &client.DA.Internal,
 	}
 }

api/rpc_test.go

@@ -22,6 +22,8 @@ import (
 	"github.com/celestiaorg/celestia-node/nodebuilder"
 	"github.com/celestiaorg/celestia-node/nodebuilder/blob"
 	blobMock "github.com/celestiaorg/celestia-node/nodebuilder/blob/mocks"
+	"github.com/celestiaorg/celestia-node/nodebuilder/da"
+	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/fraud"
@@ -91,6 +93,7 @@ type api struct {
 	Node   node.Module
 	P2P    p2p.Module
 	Blob   blob.Module
+	DA     da.Module
 }
 
 func TestModulesImplementFullAPI(t *testing.T) {
@@ -297,6 +300,7 @@ func setupNodeWithAuthedRPC(t *testing.T, auth jwt.Signer) (*nodebuilder.Node, *
 		p2pMock.NewMockModule(ctrl),
 		nodeMock.NewMockModule(ctrl),
 		blobMock.NewMockModule(ctrl),
+		daMock.NewMockModule(ctrl),
 	}
 
 	// given the behavior of fx.Invoke, this invoke will be called last as it is added at the root
@@ -310,6 +314,7 @@ func setupNodeWithAuthedRPC(t *testing.T, auth jwt.Signer) (*nodebuilder.Node, *
 		srv.RegisterAuthedService("p2p", mockAPI.P2P, &p2p.API{})
 		srv.RegisterAuthedService("node", mockAPI.Node, &node.API{})
 		srv.RegisterAuthedService("blob", mockAPI.Blob, &blob.API{})
+		srv.RegisterAuthedService("da", mockAPI.DA, &da.API{})
 	})
 	// fx.Replace does not work here, but fx.Decorate does
 	nd := nodebuilder.TestNode(t, node.Full, invokeRPC, fx.Decorate(func() (jwt.Signer, error) {
@@ -334,4 +339,5 @@ type mockAPI struct {
 	P2P    *p2pMock.MockModule
 	Node   *nodeMock.MockModule
 	Blob   *blobMock.MockModule
+	DA     *daMock.MockModule
 }

nodebuilder/da/module.go

@@ -0,0 +1,14 @@
+package da
+
+import (
+	"go.uber.org/fx"
+)
+
+func ConstructModule() fx.Option {
+	return fx.Module("da",
+		fx.Provide(NewService),
+		fx.Provide(func(serv *Service) Module {
+			return serv
+		}),
+	)
+}

nodebuilder/da/service.go

@@ -13,6 +13,7 @@ import (
 	"github.com/celestiaorg/nmt"
 
 	"github.com/celestiaorg/celestia-node/blob"
+	nodeblob "github.com/celestiaorg/celestia-node/nodebuilder/blob"
 	"github.com/celestiaorg/celestia-node/share"
 )
 
@@ -26,7 +27,13 @@ var log = logging.Logger("go-da")
 const heightLen = 8
 
 type Service struct {
-	blobServ blob.Service
+	blobServ nodeblob.Module
+}
+
+func NewService(blobMod nodeblob.Module) *Service {
+	return &Service{
+		blobServ: blobMod,
+	}
 }
 
 // MaxBlobSize returns the max blob size

nodebuilder/module.go

@@ -9,6 +9,7 @@ import (
 	"github.com/celestiaorg/celestia-node/libs/fxutil"
 	"github.com/celestiaorg/celestia-node/nodebuilder/blob"
 	"github.com/celestiaorg/celestia-node/nodebuilder/core"
+	"github.com/celestiaorg/celestia-node/nodebuilder/da"
 	"github.com/celestiaorg/celestia-node/nodebuilder/das"
 	"github.com/celestiaorg/celestia-node/nodebuilder/fraud"
 	"github.com/celestiaorg/celestia-node/nodebuilder/gateway"
@@ -55,6 +56,7 @@ func ConstructModule(tp node.Type, network p2p.Network, cfg *Config, store Store
 		das.ConstructModule(tp, &cfg.DASer),
 		fraud.ConstructModule(tp),
 		blob.ConstructModule(),
+		da.ConstructModule(),
 		node.ConstructModule(tp),
 		prune.ConstructModule(tp),
 		rpc.ConstructModule(tp, &cfg.RPC),

nodebuilder/rpc/constructors.go

@@ -5,6 +5,7 @@ import (
 
 	"github.com/celestiaorg/celestia-node/api/rpc"
 	"github.com/celestiaorg/celestia-node/nodebuilder/blob"
+	"github.com/celestiaorg/celestia-node/nodebuilder/da"
 	"github.com/celestiaorg/celestia-node/nodebuilder/das"
 	"github.com/celestiaorg/celestia-node/nodebuilder/fraud"
 	"github.com/celestiaorg/celestia-node/nodebuilder/header"
@@ -24,6 +25,7 @@ func registerEndpoints(
 	p2pMod p2p.Module,
 	nodeMod node.Module,
 	blobMod blob.Module,
+	daMod da.Module,
 	serv *rpc.Server,
 ) {
 	serv.RegisterAuthedService("fraud", fraudMod, &fraud.API{})
@@ -34,6 +36,7 @@ func registerEndpoints(
 	serv.RegisterAuthedService("p2p", p2pMod, &p2p.API{})
 	serv.RegisterAuthedService("node", nodeMod, &node.API{})
 	serv.RegisterAuthedService("blob", blobMod, &blob.API{})
+	serv.RegisterAuthedService("da", daMod, &da.API{})
 }
 
 func server(cfg *Config, auth jwt.Signer) *rpc.Server {