Reconcile project structure (#53)

Layr-Labs · Nov 21, 2023 · b9edd65 · b9edd65
1 parent 2020a95
commit b9edd65
Show file tree

Hide file tree

Showing 43 changed files with 36 additions and 36 deletions.
diff --git a/Makefile b/Makefile
@@ -1,9 +1,9 @@
 .PHONY: compile-el compile-dl clean protoc lint build unit-tests integration-tests-churner integration-tests-indexer integration-tests-inabox integration-tests-inabox-nochurner integration-tests-graph-indexer
 
 PROTOS := ./api/proto
-PROTOS_DISPERSER := ./disperser/proto
+PROTOS_DISPERSER := ./disperser/api/proto
 PROTO_GEN := ./api/grpc
-PROTO_GEN_DISPERSER_PATH = ./disperser/proto/protogen
+PROTO_GEN_DISPERSER_PATH = ./disperser/api/grpc
 
 compile-el:
 	cd contracts && ./compile.sh compile-el

diff --git a/churner/Dockerfile → churner/cmd/Dockerfile b/churner/Dockerfile → churner/cmd/Dockerfile
diff --git a/disperser/Makefile b/disperser/Makefile
@@ -7,7 +7,7 @@ build_batcher:
 	go build -o ./bin/batcher ./cmd/batcher
 
 build_server:
-	go build -o ./bin/server ./cmd/disperserserver
+	go build -o ./bin/server ./cmd/apiserver
 
 build_encoder:
 	go build -o ./bin/encoder ./cmd/encoder

diff --git a/...rser/proto/protogen/encoder/encoder.pb.go → disperser/api/grpc/encoder/encoder.pb.go b/...rser/proto/protogen/encoder/encoder.pb.go → disperser/api/grpc/encoder/encoder.pb.go
diff --git a/...proto/protogen/encoder/encoder_grpc.pb.go → ...erser/api/grpc/encoder/encoder_grpc.pb.go b/...proto/protogen/encoder/encoder_grpc.pb.go → ...erser/api/grpc/encoder/encoder_grpc.pb.go
diff --git a/disperser/proto/encoder/encoder.proto → disperser/api/proto/encoder/encoder.proto b/disperser/proto/encoder/encoder.proto → disperser/api/proto/encoder/encoder.proto
diff --git a/disperser/apiserver/server_test.go b/disperser/apiserver/server_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/Layr-Labs/eigenda/disperser/apiserver"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	gethcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/google/uuid"
 

diff --git a/disperser/batcher/batcher_test.go b/disperser/batcher/batcher_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/Layr-Labs/eigenda/disperser"
 	bat "github.com/Layr-Labs/eigenda/disperser/batcher"
 	batchermock "github.com/Layr-Labs/eigenda/disperser/batcher/mock"
-	"github.com/Layr-Labs/eigenda/disperser/inmem"
+	"github.com/Layr-Labs/eigenda/disperser/common/inmem"
 	dmock "github.com/Layr-Labs/eigenda/disperser/mock"
 	"github.com/Layr-Labs/eigenda/pkg/encoding/kzgEncoder"
 	gethcommon "github.com/ethereum/go-ethereum/common"

diff --git a/disperser/batcher/encoding_streamer_test.go b/disperser/batcher/encoding_streamer_test.go
@@ -12,7 +12,7 @@ import (
 	coremock "github.com/Layr-Labs/eigenda/core/mock"
 	"github.com/Layr-Labs/eigenda/disperser"
 	"github.com/Layr-Labs/eigenda/disperser/batcher"
-	"github.com/Layr-Labs/eigenda/disperser/inmem"
+	"github.com/Layr-Labs/eigenda/disperser/common/inmem"
 	"github.com/Layr-Labs/eigenda/disperser/mock"
 	"github.com/stretchr/testify/assert"
 	tmock "github.com/stretchr/testify/mock"

diff --git a/disperser/eth/confirmer.go → disperser/batcher/eth/confirmer.go b/disperser/eth/confirmer.go → disperser/batcher/eth/confirmer.go
diff --git a/disperser/eth/confirmer_test.go → disperser/batcher/eth/confirmer_test.go b/disperser/eth/confirmer_test.go → disperser/batcher/eth/confirmer_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Layr-Labs/eigenda/core"
 	coremock "github.com/Layr-Labs/eigenda/core/mock"
-	"github.com/Layr-Labs/eigenda/disperser/eth"
+	"github.com/Layr-Labs/eigenda/disperser/batcher/eth"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"

diff --git a/disperser/batcher/finalizer_test.go b/disperser/batcher/finalizer_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/Layr-Labs/eigenda/core"
 	"github.com/Layr-Labs/eigenda/disperser"
 	"github.com/Layr-Labs/eigenda/disperser/batcher"
-	"github.com/Layr-Labs/eigenda/disperser/inmem"
+	"github.com/Layr-Labs/eigenda/disperser/common/inmem"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/stretchr/testify/assert"

diff --git a/disperser/dispatcher/dispatcher.go → disperser/batcher/grpc/dispatcher.go b/disperser/dispatcher/dispatcher.go → disperser/batcher/grpc/dispatcher.go
diff --git a/disperser/disperser.Dockerfile → disperser/cmd/apiserver/Dockerfile b/disperser/disperser.Dockerfile → disperser/cmd/apiserver/Dockerfile
diff --git a/disperser/cmd/disperserserver/config.go → disperser/cmd/apiserver/config.go b/disperser/cmd/disperserserver/config.go → disperser/cmd/apiserver/config.go
@@ -7,8 +7,8 @@ import (
 	"github.com/Layr-Labs/eigenda/common/ratelimit"
 	"github.com/Layr-Labs/eigenda/disperser"
 	"github.com/Layr-Labs/eigenda/disperser/apiserver"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
-	"github.com/Layr-Labs/eigenda/disperser/cmd/disperserserver/flags"
+	"github.com/Layr-Labs/eigenda/disperser/cmd/apiserver/flags"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	"github.com/urfave/cli"
 )
 

diff --git a/disperser/cmd/disperserserver/flags/flags.go → disperser/cmd/apiserver/flags/flags.go b/disperser/cmd/disperserserver/flags/flags.go → disperser/cmd/apiserver/flags/flags.go
diff --git a/disperser/cmd/disperserserver/main.go → disperser/cmd/apiserver/main.go b/disperser/cmd/disperserserver/main.go → disperser/cmd/apiserver/main.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/Layr-Labs/eigenda/common"
 	"github.com/Layr-Labs/eigenda/disperser/apiserver"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 
 	"github.com/Layr-Labs/eigenda/common/aws/dynamodb"
 	"github.com/Layr-Labs/eigenda/common/aws/s3"
@@ -19,7 +19,7 @@ import (
 	"github.com/Layr-Labs/eigenda/common/store"
 	"github.com/Layr-Labs/eigenda/core/eth"
 	"github.com/Layr-Labs/eigenda/disperser"
-	"github.com/Layr-Labs/eigenda/disperser/cmd/disperserserver/flags"
+	"github.com/Layr-Labs/eigenda/disperser/cmd/apiserver/flags"
 	"github.com/urfave/cli"
 )
 

diff --git a/disperser/batcher.Dockerfile → disperser/cmd/batcher/Dockerfile b/disperser/batcher.Dockerfile → disperser/cmd/batcher/Dockerfile
diff --git a/disperser/cmd/batcher/config.go b/disperser/cmd/batcher/config.go
@@ -6,8 +6,8 @@ import (
 	"github.com/Layr-Labs/eigenda/common/logging"
 	"github.com/Layr-Labs/eigenda/core/encoding"
 	"github.com/Layr-Labs/eigenda/disperser/batcher"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
 	"github.com/Layr-Labs/eigenda/disperser/cmd/batcher/flags"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	"github.com/Layr-Labs/eigenda/indexer"
 	"github.com/urfave/cli"
 )

diff --git a/disperser/cmd/batcher/main.go b/disperser/cmd/batcher/main.go
@@ -22,11 +22,11 @@ import (
 	"github.com/Layr-Labs/eigenda/core"
 	coreeth "github.com/Layr-Labs/eigenda/core/eth"
 	"github.com/Layr-Labs/eigenda/disperser/batcher"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
+	"github.com/Layr-Labs/eigenda/disperser/batcher/eth"
+	dispatcher "github.com/Layr-Labs/eigenda/disperser/batcher/grpc"
 	"github.com/Layr-Labs/eigenda/disperser/cmd/batcher/flags"
-	"github.com/Layr-Labs/eigenda/disperser/dispatcher"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	"github.com/Layr-Labs/eigenda/disperser/encoder"
-	"github.com/Layr-Labs/eigenda/disperser/eth"
 	"github.com/ethereum/go-ethereum/rpc"
 	"github.com/urfave/cli"
 )

diff --git a/disperser/dataapi.Dockerfile → disperser/cmd/dataapi/Dockerfile b/disperser/dataapi.Dockerfile → disperser/cmd/dataapi/Dockerfile
diff --git a/disperser/cmd/dataapi/config.go b/disperser/cmd/dataapi/config.go
@@ -4,8 +4,8 @@ import (
 	"github.com/Layr-Labs/eigenda/common/aws"
 	"github.com/Layr-Labs/eigenda/common/geth"
 	"github.com/Layr-Labs/eigenda/common/logging"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
 	"github.com/Layr-Labs/eigenda/disperser/cmd/dataapi/flags"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi/prometheus"
 	"github.com/urfave/cli"

diff --git a/disperser/cmd/dataapi/main.go b/disperser/cmd/dataapi/main.go
@@ -11,8 +11,8 @@ import (
 	"github.com/Layr-Labs/eigenda/common/geth"
 	"github.com/Layr-Labs/eigenda/common/logging"
 	coreeth "github.com/Layr-Labs/eigenda/core/eth"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
 	"github.com/Layr-Labs/eigenda/disperser/cmd/dataapi/flags"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi/prometheus"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi/subgraph"

diff --git a/disperser/encoder.Dockerfile → disperser/cmd/encoder/Dockerfile b/disperser/encoder.Dockerfile → disperser/cmd/encoder/Dockerfile
diff --git a/disperser/blobstore/blob_metadata_store.go → ...r/common/blobstore/blob_metadata_store.go b/disperser/blobstore/blob_metadata_store.go → ...r/common/blobstore/blob_metadata_store.go
diff --git a/...ser/blobstore/blob_metadata_store_test.go → ...mon/blobstore/blob_metadata_store_test.go b/...ser/blobstore/blob_metadata_store_test.go → ...mon/blobstore/blob_metadata_store_test.go
diff --git a/disperser/blobstore/blobstore_test.go → disperser/common/blobstore/blobstore_test.go b/disperser/blobstore/blobstore_test.go → disperser/common/blobstore/blobstore_test.go
@@ -14,7 +14,7 @@ import (
 
 	cmock "github.com/Layr-Labs/eigenda/common/mock"
 	"github.com/Layr-Labs/eigenda/core"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	"github.com/Layr-Labs/eigenda/inabox/deploy"
 	"github.com/ory/dockertest/v3"
 )

diff --git a/disperser/blobstore/shared_storage.go → disperser/common/blobstore/shared_storage.go b/disperser/blobstore/shared_storage.go → disperser/common/blobstore/shared_storage.go
diff --git a/disperser/blobstore/shared_storage_test.go → ...r/common/blobstore/shared_storage_test.go b/disperser/blobstore/shared_storage_test.go → ...r/common/blobstore/shared_storage_test.go
diff --git a/disperser/inmem/store.go → disperser/common/inmem/store.go b/disperser/inmem/store.go → disperser/common/inmem/store.go
diff --git a/disperser/inmem/store_test.go → disperser/common/inmem/store_test.go b/disperser/inmem/store_test.go → disperser/common/inmem/store_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Layr-Labs/eigenda/core"
 	"github.com/Layr-Labs/eigenda/disperser"
-	"github.com/Layr-Labs/eigenda/disperser/inmem"
+	"github.com/Layr-Labs/eigenda/disperser/common/inmem"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/disperser/dataapi/server_test.go b/disperser/dataapi/server_test.go
@@ -14,10 +14,10 @@ import (
 	"github.com/Layr-Labs/eigenda/core"
 	coremock "github.com/Layr-Labs/eigenda/core/mock"
 	"github.com/Layr-Labs/eigenda/disperser"
+	"github.com/Layr-Labs/eigenda/disperser/common/inmem"
 	"github.com/Layr-Labs/eigenda/disperser/dataapi"
 	prommock "github.com/Layr-Labs/eigenda/disperser/dataapi/prometheus/mock"
 	subgraphmock "github.com/Layr-Labs/eigenda/disperser/dataapi/subgraph/mock"
-	"github.com/Layr-Labs/eigenda/disperser/inmem"
 	"github.com/Layr-Labs/eigenda/pkg/kzg/bn254"
 	"github.com/consensys/gnark-crypto/ecc/bn254/fp"
 	"github.com/ethereum/go-ethereum/common"

diff --git a/disperser/encoder/client.go b/disperser/encoder/client.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Layr-Labs/eigenda/core"
 	"github.com/Layr-Labs/eigenda/disperser"
-	pb "github.com/Layr-Labs/eigenda/disperser/proto/protogen/encoder"
+	pb "github.com/Layr-Labs/eigenda/disperser/api/grpc/encoder"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
 )

diff --git a/disperser/encoder/server.go b/disperser/encoder/server.go
@@ -11,7 +11,7 @@ import (
 	"github.com/Layr-Labs/eigenda/common/healthcheck"
 	"github.com/Layr-Labs/eigenda/core"
 	"github.com/Layr-Labs/eigenda/disperser"
-	pb "github.com/Layr-Labs/eigenda/disperser/proto/protogen/encoder"
+	pb "github.com/Layr-Labs/eigenda/disperser/api/grpc/encoder"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )

diff --git a/disperser/encoder/server_test.go b/disperser/encoder/server_test.go
@@ -18,7 +18,7 @@ import (
 	"github.com/Layr-Labs/eigenda/core"
 	"github.com/Layr-Labs/eigenda/core/encoding"
 	coremock "github.com/Layr-Labs/eigenda/core/mock"
-	pb "github.com/Layr-Labs/eigenda/disperser/proto/protogen/encoder"
+	pb "github.com/Layr-Labs/eigenda/disperser/api/grpc/encoder"
 	"github.com/Layr-Labs/eigenda/pkg/encoding/kzgEncoder"
 	"github.com/Layr-Labs/eigenda/pkg/kzg/bn254"
 )

diff --git a/docker-compose-build.yaml b/docker-compose-build.yaml
@@ -3,22 +3,22 @@ services:
   batcher:
     build:
       context: .
-      dockerfile: disperser/batcher.Dockerfile
+      dockerfile: disperser/cmd/batcher/Dockerfile
     image: ghcr.io/layr-labs/eigenda/batcher:${BUILD_TAG:-latest}
   disperser:
     build:
       context: .
-      dockerfile: disperser/disperser.Dockerfile
+      dockerfile: disperser/cmd/apiserver/Dockerfile
     image: ghcr.io/layr-labs/eigenda/disperser:${BUILD_TAG:-latest}
   encoder:
     build:
       context: .
-      dockerfile: disperser/encoder.Dockerfile
+      dockerfile: disperser/cmd/encoder/Dockerfile
     image: ghcr.io/layr-labs/eigenda/encoder:${BUILD_TAG:-latest}
   retriever:
     build:
       context: .
-      dockerfile: retriever/Dockerfile
+      dockerfile: retriever/cmd/Dockerfile
     image: ghcr.io/layr-labs/eigenda/retriever:${BUILD_TAG:-latest}
   node:
     build:
@@ -28,10 +28,10 @@ services:
   churner:
     build:
       context: .
-      dockerfile: churner/Dockerfile
+      dockerfile: churner/cmd/Dockerfile
     image: ghcr.io/layr-labs/eigenda/churner:${BUILD_TAG:-latest}
   nodeplugin:
     build:
       context: .
-      dockerfile: node/plugin/Dockerfile
+      dockerfile: node/plugin/cmd/Dockerfile
     image: ghcr.io/layr-labs/eigenda/nodeplugin:${BUILD_TAG:-latest}
diff --git a/inabox/deploy/codegen/main.go b/inabox/deploy/codegen/main.go
@@ -8,8 +8,8 @@ import (
 	"text/template"
 
 	churner "github.com/Layr-Labs/eigenda/churner/flags"
+	dis "github.com/Layr-Labs/eigenda/disperser/cmd/apiserver/flags"
 	bat "github.com/Layr-Labs/eigenda/disperser/cmd/batcher/flags"
-	dis "github.com/Layr-Labs/eigenda/disperser/cmd/disperserserver/flags"
 	enc "github.com/Layr-Labs/eigenda/disperser/cmd/encoder/flags"
 	opr "github.com/Layr-Labs/eigenda/node/flags"
 	retriever "github.com/Layr-Labs/eigenda/retriever/flags"

diff --git a/inabox/deploy/localstack.go b/inabox/deploy/localstack.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/Layr-Labs/eigenda/common/aws"
 	"github.com/Layr-Labs/eigenda/common/store"
-	"github.com/Layr-Labs/eigenda/disperser/blobstore"
+	"github.com/Layr-Labs/eigenda/disperser/common/blobstore"
 	"github.com/ory/dockertest/v3"
 	"github.com/ory/dockertest/v3/docker"
 

diff --git a/node/grpc/server_load_test.go b/node/grpc/server_load_test.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/Layr-Labs/eigenda/core"
 	"github.com/Layr-Labs/eigenda/disperser/batcher"
-	"github.com/Layr-Labs/eigenda/disperser/dispatcher"
+	dispatcher "github.com/Layr-Labs/eigenda/disperser/batcher/grpc"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/node/plugin/Dockerfile → node/plugin/cmd/Dockerfile b/node/plugin/Dockerfile → node/plugin/cmd/Dockerfile
diff --git a/retriever/Dockerfile → retriever/cmd/Dockerfile b/retriever/Dockerfile → retriever/cmd/Dockerfile
diff --git a/test/integration_test.go b/test/integration_test.go
@@ -19,7 +19,7 @@ import (
 
 	clientsmock "github.com/Layr-Labs/eigenda/clients/mock"
 	"github.com/Layr-Labs/eigenda/disperser/apiserver"
-	"github.com/Layr-Labs/eigenda/disperser/dispatcher"
+	dispatcher "github.com/Layr-Labs/eigenda/disperser/batcher/grpc"
 	"github.com/Layr-Labs/eigenda/disperser/encoder"
 	"github.com/Layr-Labs/eigenda/retriever"
 	retrievermock "github.com/Layr-Labs/eigenda/retriever/mock"
@@ -36,7 +36,7 @@ import (
 	"github.com/Layr-Labs/eigenda/disperser"
 	"github.com/Layr-Labs/eigenda/disperser/batcher"
 	batchermock "github.com/Layr-Labs/eigenda/disperser/batcher/mock"
-	"github.com/Layr-Labs/eigenda/disperser/inmem"
+	"github.com/Layr-Labs/eigenda/disperser/common/inmem"
 	dispersermock "github.com/Layr-Labs/eigenda/disperser/mock"
 	"github.com/Layr-Labs/eigenda/node"
 	nodegrpc "github.com/Layr-Labs/eigenda/node/grpc"

diff --git a/test/synthetic-test/synthetic_client_test.go b/test/synthetic-test/synthetic_client_test.go
@@ -27,7 +27,7 @@ import (
 	"github.com/Layr-Labs/eigenda/core"
 	"github.com/Layr-Labs/eigenda/core/encoding"
 	coremock "github.com/Layr-Labs/eigenda/core/mock"
-	encoder_rpc "github.com/Layr-Labs/eigenda/disperser/proto/protogen/encoder"
+	encoder_rpc "github.com/Layr-Labs/eigenda/disperser/api/grpc/encoder"
 	"github.com/Layr-Labs/eigenda/pkg/encoding/kzgEncoder"
 	gcommon "github.com/ethereum/go-ethereum/common"
 	"github.com/stretchr/testify/assert"