Efficient-unit-tests

.github/actions/test-coverage/action.yml

@@ -36,6 +36,12 @@ runs:
       with:
         go-version: ${{inputs.go-version}}
 
+    - name: Download coverage artifact
+      uses: actions/download-artifact@v2
+      with:
+        name: coverage
+        path: .
+
     - name: Generate coverage report
       shell: bash
       env:

.github/actions/test-coverage/coverage.sh

@@ -52,10 +52,12 @@ set -euo pipefail
 SCRIPT_DIR="$(dirname -- "$(readlink -f "${BASH_SOURCE[0]}")")"
 
 OUT_DIR="${1-$SCRIPT_DIR}"
-OUT_FILE="$(mktemp)"
 
-# Get coverage for all packages in the current directory; store next to script.
-go test -short ./...  -coverprofile "$OUT_FILE"
+# OUT_FILE="$(mktemp)"
+# # Get coverage for all packages in the current directory; store next to script.
+# go test -short ./...  -coverprofile "$OUT_FILE"
+
+OUT_FILE="coverage.out"
 
 if [[ "${INPUT_REPORT-true}" == "true" ]]; then
 	# Create an HTML report; store next to script.

.github/workflows/test-coverage.yml

@@ -1,11 +1,11 @@
 name: test-coverage
 
 on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
+  # push:
+  #   branches: [ master ]
+  # pull_request:
+  #   branches: [ master ]
+  # workflow_dispatch:
 
 jobs:
 

.github/workflows/unit-tests.yml

@@ -38,4 +38,23 @@ jobs:
         run: make build
 
       - name: Test all
-        run: go test -coverprofile=coverage.out -short ./... 
+        run: ./test.sh -coverprofile=coverage.out
+
+      - name: Upload coverage artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: coverage
+          path: coverage.out
+
+  coverage-report: 
+    name: Coverage Report
+    needs: unit-tests
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Update coverage badge
+        uses: ./.github/actions/test-coverage
+        with:
+          chart: true
+          amend: true

Makefile

@@ -1,4 +1,4 @@
-.PHONY: compile-el compile-dl clean protoc lint
+.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
@@ -45,7 +45,7 @@ build:
 	cd tools/traffic && make build
 
 unit-tests:
-	go clean -testcache && go test -short ./... -p 2 -race
+	./test.sh
 
 integration-tests-churner:
 	go test -v ./churner/tests

common/aws/dynamodb/client_test.go

@@ -23,6 +23,9 @@ var (
 	dockertestResource *dockertest.Resource
 	dynamoClient       *commondynamodb.Client
 	clientConfig       commonaws.ClientConfig
+
+	deployLocalStack bool
+	localStackPort   = "4567"
 )
 
 func TestMain(m *testing.M) {
@@ -33,13 +36,19 @@ func TestMain(m *testing.M) {
 }
 
 func setup(m *testing.M) {
-	localStackPort := "4567"
-	pool, resource, err := deploy.StartDockertestWithLocalstackContainer(localStackPort)
-	dockertestPool = pool
-	dockertestResource = resource
-	if err != nil {
-		teardown()
-		panic("failed to start localstack container")
+
+	deployLocalStack = !(os.Getenv("DEPLOY_LOCALSTACK") == "false")
+	if !deployLocalStack {
+		localStackPort = os.Getenv("LOCALSTACK_PORT")
+	}
+
+	if deployLocalStack {
+		var err error
+		dockertestPool, dockertestResource, err = deploy.StartDockertestWithLocalstackContainer(localStackPort)
+		if err != nil {
+			teardown()
+			panic("failed to start localstack container")
+		}
 	}
 
 	logger, err := logging.GetLogger(logging.DefaultCLIConfig())
@@ -62,7 +71,9 @@ func setup(m *testing.M) {
 }
 
 func teardown() {
-	deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	if deployLocalStack {
+		deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	}
 }
 
 func createTable(t *testing.T, tableName string) {

common/store/dynamo_store_test.go

@@ -23,7 +23,9 @@ var (
 
 	dockertestPool     *dockertest.Pool
 	dockertestResource *dockertest.Resource
-	localStackPort     string
+
+	deployLocalStack bool
+	localStackPort   = "4566"
 
 	dynamoClient     *dynamodb.Client
 	dynamoParamStore common.KVStore[common.RateBucketParams]
@@ -38,13 +40,19 @@ func TestMain(m *testing.M) {
 }
 
 func setup(m *testing.M) {
-	localStackPort = "4569"
-	pool, resource, err := deploy.StartDockertestWithLocalstackContainer(localStackPort)
-	dockertestPool = pool
-	dockertestResource = resource
-	if err != nil {
-		teardown()
-		panic("failed to start localstack container")
+
+	deployLocalStack = !(os.Getenv("DEPLOY_LOCALSTACK") == "false")
+	if !deployLocalStack {
+		localStackPort = os.Getenv("LOCALSTACK_PORT")
+	}
+
+	if deployLocalStack {
+		var err error
+		dockertestPool, dockertestResource, err = deploy.StartDockertestWithLocalstackContainer(localStackPort)
+		if err != nil {
+			teardown()
+			panic("failed to start localstack container")
+		}
 	}
 
 	cfg := aws.ClientConfig{
@@ -53,23 +61,26 @@ func setup(m *testing.M) {
 		SecretAccessKey: "localstack",
 		EndpointURL:     fmt.Sprintf("http://0.0.0.0:%s", localStackPort),
 	}
-	dynamoClient, err = dynamodb.NewClient(cfg, logger)
+
+	_, err := test_utils.CreateTable(context.Background(), cfg, bucketTableName, store.GenerateTableSchema(10, 10, bucketTableName))
 	if err != nil {
 		teardown()
-		panic("failed to create dynamodb client: " + err.Error())
+		panic("failed to create dynamodb table: " + err.Error())
 	}
 
-	_, err = test_utils.CreateTable(context.Background(), cfg, bucketTableName, store.GenerateTableSchema(10, 10, bucketTableName))
+	dynamoClient, err = dynamodb.NewClient(cfg, logger)
 	if err != nil {
 		teardown()
-		panic("failed to create dynamodb table: " + err.Error())
+		panic("failed to create dynamodb client: " + err.Error())
 	}
 
 	dynamoParamStore = store.NewDynamoParamStore[common.RateBucketParams](dynamoClient, bucketTableName)
 }
 
 func teardown() {
-	deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	if deployLocalStack {
+		deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	}
 }
 
 func TestDynamoBucketStore(t *testing.T) {

disperser/apiserver/server_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/Layr-Labs/eigenda/disperser/apiserver"
 	"github.com/Layr-Labs/eigenda/disperser/blobstore"
 	gethcommon "github.com/ethereum/go-ethereum/common"
+	"github.com/google/uuid"
 
 	pb "github.com/Layr-Labs/eigenda/api/grpc/disperser"
 	"github.com/Layr-Labs/eigenda/common"
@@ -36,9 +37,12 @@ var (
 	dispersalServer    *apiserver.DispersalServer
 	dockertestPool     *dockertest.Pool
 	dockertestResource *dockertest.Resource
-	localStackPort     string
-	metadataTableName  = "test-BlobMetadata"
-	bucketTableName    = "test-BucketStore"
+	UUID               = uuid.New()
+	metadataTableName  = fmt.Sprintf("test-BlobMetadata-%v", UUID)
+	bucketTableName    = fmt.Sprintf("test-BucketStore-%v", UUID)
+
+	deployLocalStack bool
+	localStackPort   = "4568"
 )
 
 func TestMain(m *testing.M) {
@@ -276,16 +280,24 @@ func TestDisperseBlobWithExceedSizeLimit(t *testing.T) {
 }
 
 func setup(m *testing.M) {
-	localStackPort = "4568"
-	pool, resource, err := deploy.StartDockertestWithLocalstackContainer(localStackPort)
-	dockertestPool = pool
-	dockertestResource = resource
-	if err != nil {
-		teardown()
-		panic("failed to start localstack container")
+
+	deployLocalStack = !(os.Getenv("DEPLOY_LOCALSTACK") == "false")
+	if !deployLocalStack {
+		localStackPort = os.Getenv("LOCALSTACK_PORT")
+	}
+
+	if deployLocalStack {
+
+		var err error
+		dockertestPool, dockertestResource, err = deploy.StartDockertestWithLocalstackContainer(localStackPort)
+		if err != nil {
+			teardown()
+			panic("failed to start localstack container")
+		}
+
 	}
 
-	err = deploy.DeployResources(pool, localStackPort, metadataTableName, bucketTableName)
+	err := deploy.DeployResources(dockertestPool, localStackPort, metadataTableName, bucketTableName)
 	if err != nil {
 		teardown()
 		panic("failed to deploy AWS resources")
@@ -295,7 +307,9 @@ func setup(m *testing.M) {
 }
 
 func teardown() {
-	deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	if deployLocalStack {
+		deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	}
 }
 
 func newTestServer(m *testing.M) *apiserver.DispersalServer {

disperser/blobstore/blobstore_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/Layr-Labs/eigenda/common/aws"
 	"github.com/Layr-Labs/eigenda/common/aws/dynamodb"
 	test_utils "github.com/Layr-Labs/eigenda/common/aws/dynamodb/utils"
+	"github.com/google/uuid"
 
 	cmock "github.com/Layr-Labs/eigenda/common/mock"
 	"github.com/Layr-Labs/eigenda/core"
@@ -39,12 +40,16 @@ var (
 
 	dockertestPool     *dockertest.Pool
 	dockertestResource *dockertest.Resource
-	localStackPort     string
+
+	deployLocalStack bool
+	localStackPort   = "4569"
 
 	dynamoClient      *dynamodb.Client
 	blobMetadataStore *blobstore.BlobMetadataStore
-	metadataTableName = "test-BlobMetadata"
 	sharedStorage     *blobstore.SharedBlobStore
+
+	UUID              = uuid.New()
+	metadataTableName = fmt.Sprintf("test-BlobMetadata-%v", UUID)
 )
 
 func TestMain(m *testing.M) {
@@ -55,13 +60,20 @@ func TestMain(m *testing.M) {
 }
 
 func setup(m *testing.M) {
-	localStackPort = "4569"
-	pool, resource, err := deploy.StartDockertestWithLocalstackContainer(localStackPort)
-	dockertestPool = pool
-	dockertestResource = resource
-	if err != nil {
-		teardown()
-		panic("failed to start localstack container")
+
+	deployLocalStack = !(os.Getenv("DEPLOY_LOCALSTACK") == "false")
+	if !deployLocalStack {
+		localStackPort = os.Getenv("LOCALSTACK_PORT")
+	}
+
+	if deployLocalStack {
+		var err error
+		dockertestPool, dockertestResource, err = deploy.StartDockertestWithLocalstackContainer(localStackPort)
+		if err != nil {
+			teardown()
+			panic("failed to start localstack container")
+		}
+
 	}
 
 	cfg := aws.ClientConfig{
@@ -70,22 +82,25 @@ func setup(m *testing.M) {
 		SecretAccessKey: "localstack",
 		EndpointURL:     fmt.Sprintf("http://0.0.0.0:%s", localStackPort),
 	}
-	dynamoClient, err = dynamodb.NewClient(cfg, logger)
+
+	_, err := test_utils.CreateTable(context.Background(), cfg, metadataTableName, blobstore.GenerateTableSchema(metadataTableName, 10, 10))
 	if err != nil {
 		teardown()
-		panic("failed to create dynamodb client: " + err.Error())
+		panic("failed to create dynamodb table: " + err.Error())
 	}
 
-	_, err = test_utils.CreateTable(context.Background(), cfg, metadataTableName, blobstore.GenerateTableSchema(metadataTableName, 10, 10))
+	dynamoClient, err = dynamodb.NewClient(cfg, logger)
 	if err != nil {
 		teardown()
-		panic("failed to create dynamodb table: " + err.Error())
+		panic("failed to create dynamodb client: " + err.Error())
 	}
 
 	blobMetadataStore = blobstore.NewBlobMetadataStore(dynamoClient, logger, metadataTableName, time.Hour)
 	sharedStorage = blobstore.NewSharedStorage(bucketName, s3Client, blobMetadataStore, logger)
 }
 
 func teardown() {
-	deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	if deployLocalStack {
+		deploy.PurgeDockertestResources(dockertestPool, dockertestResource)
+	}
 }

inabox/Makefile

@@ -13,7 +13,7 @@ stop-geth:
 	cd geth && docker compose down
 
 
-.PHONY: new-anvil new-docker-anvil infra resources exp deploy-all stop-infra run-e2e run-e2e-nochurner run-e2e-nograph clean
+.PHONY: new-anvil new-docker-anvil chain localstack exp deploy-all stop-infra run-e2e run-e2e-nochurner run-e2e-nograph clean
 
 new-anvil:
 	mkdir -p "testdata/$(dt)"
@@ -23,11 +23,11 @@ new-docker-anvil:
 	mkdir -p "testdata/$(dt)"
 	cp ./templates/testconfig-anvil-docker.yaml "testdata/$(dt)/config.yaml"
 
-infra:
-	go run ./deploy/cmd -localstack-port 4570 infra
+chain:
+	go run ./deploy/cmd -localstack-port 4570 chain
 
-resources:
-	go run ./deploy/cmd -localstack-port 4570 resources
+localstack:
+	go run ./deploy/cmd -localstack-port 4570 localstack
 
 exp: 
 	go run ./deploy/cmd exp
@@ -38,7 +38,7 @@ deploy-all:
 stop-infra:
 	./bin.sh stop-anvil
 	./bin.sh stop-graph
-	docker stop $(shell docker container ls --all --filter=ancestor=localstack/localstack:latest --format "{{.ID}}")
+	docker stop localstack-test
 
 run-e2e:
 	go test ./tests -v -config=../templates/testconfig-anvil.yaml