Merge branch 'master' into blob-verify-util

disperser/cmd/dataapi/main.go

@@ -20,6 +20,7 @@ import (
 	"github.com/Layr-Labs/eigenda/disperser/dataapi"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi/prometheus"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi/subgraph"
+	serverv2 "github.com/Layr-Labs/eigenda/disperser/dataapi/v2"
 	"github.com/Layr-Labs/eigensdk-go/logging"
 
 	gethcommon "github.com/ethereum/go-ethereum/common"
@@ -33,7 +34,7 @@ var (
 	gitDate   string
 )
 
-// @title			EigenDA Data Access API
+// @title			EigenDA Data Access API V1
 // @description	This is the EigenDA Data Access API server.
 // @version		1
 // @Schemes		https http
@@ -131,7 +132,7 @@ func RunDataApi(ctx *cli.Context) error {
 
 	if config.ServerVersion == 2 {
 		blobMetadataStorev2 := blobstorev2.NewBlobMetadataStore(dynamoClient, logger, config.BlobstoreConfig.TableName)
-		serverv2 := dataapi.NewServerV2(
+		serverv2 := serverv2.NewServerV2(
 			dataapi.Config{
 				ServerMode:         config.ServerMode,
 				SocketAddr:         config.SocketAddr,

disperser/dataapi/Makefile

@@ -1,10 +1,17 @@
-build: 
+build:
 	cd .. && go build -o ./bin/dataapi ./cmd/dataapi
 
 test:
-	go test -v .
+	go test -v ./...
 
-generate-swagger:
-	@echo "  >  Generating swagger..."
-	swag init -g ../cmd/dataapi/main.go --parseDependency
-	swag fmt
+generate-swagger-v1:
+	@echo "  >  Generating v1 swagger..."
+	swag init -g ../cmd/dataapi/main.go --parseDependency --output docs/v1 --instanceName V1 --packageName v1 --parseDepth 0 --exclude ./v2 --dir .
+	swag fmt --dir . --exclude ./v2/server_v2.go
+
+generate-swagger-v2:
+	@echo "  >  Generating v2 swagger..."
+	swag init -g swagger.go --parseDependency --output docs/v2 --instanceName V2 --packageName v2 --dir ./v2 --parseDepth 0
+	swag fmt --dir ./v2
+
+generate-swagger: generate-swagger-v1 generate-swagger-v2