Merge branch 'vitwit/avail-da' into chandini/avail-da

.github/workflows/ci_release.yml

@@ -46,7 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Version Release
-        uses: rollkit/.github/.github/actions/version-release@v0.1.1
+        uses: rollkit/.github/.github/actions/version-release@v0.2.2
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           version-bump: ${{inputs.version}}

.github/workflows/docker-build-da-mockserv.yml

@@ -15,7 +15,7 @@ jobs:
     permissions:
       contents: write
       packages: write
-    uses: rollkit/.github/.github/workflows/reusable_dockerfile_pipeline.yml@v0.1.1 # yamllint disable-line rule:line-length
+    uses: rollkit/.github/.github/workflows/reusable_dockerfile_pipeline.yml@v0.2.2 # yamllint disable-line rule:line-length
     with:
       dockerfile: docker/mockserv.Dockerfile
       packageName: mockserv

.github/workflows/housekeeping.yml

@@ -10,7 +10,7 @@ jobs:
   issue-management:
     if: ${{ github.event.issue }}
     name: Add issues to project and add triage label
-    uses: rollkit/.github/.github/workflows/reusable_housekeeping.yml@v0.1.1
+    uses: rollkit/.github/.github/workflows/reusable_housekeeping.yml@v0.2.2
     secrets: inherit
     permissions:
       issues: write
@@ -25,7 +25,7 @@ jobs:
     # ignore dependabot PRs
     if: ${{ github.event.pull_request && github.actor != 'dependabot[bot]' }}
     name: Add PRs to project
-    uses: rollkit/.github/.github/workflows/reusable_housekeeping.yml@v0.1.1
+    uses: rollkit/.github/.github/workflows/reusable_housekeeping.yml@v0.2.2
     secrets: inherit
     permissions:
       issues: write
@@ -37,7 +37,7 @@ jobs:
   auto-add-reviewer:
     name: Auto add reviewer to PR
     if: github.event.pull_request
-    uses: rollkit/.github/.github/workflows/reusable_housekeeping.yml@v0.1.1
+    uses: rollkit/.github/.github/workflows/reusable_housekeeping.yml@v0.2.2
     secrets: inherit
     permissions:
       issues: write

.github/workflows/lint.yml

@@ -37,21 +37,21 @@ jobs:
 
   # hadolint lints the Dockerfile
   hadolint:
-    uses: rollkit/.github/.github/workflows/reusable_dockerfile_lint.yml@v0.1.1 # yamllint disable-line rule:line-length
+    uses: rollkit/.github/.github/workflows/reusable_dockerfile_lint.yml@v0.2.2 # yamllint disable-line rule:line-length
     with:
       dockerfile: docker/mockserv.Dockerfile
 
   yamllint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: rollkit/.github/.github/actions/yamllint@v0.1.1
+      - uses: rollkit/.github/.github/actions/yamllint@v0.2.2
 
   markdown-lint:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: rollkit/.github/.github/actions/markdown-lint@v0.1.1
+      - uses: rollkit/.github/.github/actions/markdown-lint@v0.2.2
 
   protobuf-lint:
     runs-on: ubuntu-latest

.github/workflows/test.yml

@@ -32,25 +32,13 @@ jobs:
         with:
           go-version: ${{ inputs.GO_VERSION }}
       - name: Run unit test
-        run: make test-unit
+        run: make test
       - name: upload coverage report
         uses: codecov/codecov-action@v3.1.4
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./coverage.txt
 
-  unit_race_test:
-    name: Run Unit Tests with Race Detector
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - name: set up go
-        uses: actions/setup-go@v4
-        with:
-          go-version: ${{ inputs.GO_VERSION }}
-      - name: execute test run
-        run: make test-unit-race
-
   integration_test:
     name: Run Integration Tests
     runs-on: ubuntu-latest

.golangci.yml

@@ -33,5 +33,8 @@ linters-settings:
     rules:
       - name: package-comments
         disabled: true
+      - name: duplicated-imports
+        severity: warning
+
   goimports:
     local-prefixes: github.com/rollkit

Makefile

@@ -1,6 +1,12 @@
 DOCKER := $(shell which docker)
 DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
 
+# Define pkgs, run, and cover vairables for test so that we can override them in
+# the terminal more easily.
+pkgs := $(shell go list ./...)
+run := .
+count := 1
+
 ## help: Show this help message
 help: Makefile
 	@echo " Choose a command run in "$(PROJECTNAME)":"
@@ -17,11 +23,19 @@ clean:
 cover:
 	@echo "--> Generating Code Coverage"
 	@go install github.com/ory/go-acc@latest
-	@go-acc -o coverage.txt `go list ./...`
+	@go-acc -o coverage.txt $(pkgs)
 .PHONY: cover
 
+## deps: Install dependencies
+deps:
+	@echo "--> Installing dependencies"
+	@go mod download
+	@make proto-gen
+	@go mod tidy
+.PHONY: deps
+
 ## lint: Run linters golangci-lint and markdownlint.
-lint:
+lint: vet
 	@echo "--> Running golangci-lint"
 	@golangci-lint run
 	@echo "--> Running markdownlint"
@@ -39,23 +53,17 @@ fmt:
 	@markdownlint --config .markdownlint.yaml '**/*.md' -f
 .PHONY: fmt
 
-## test-unit: Running unit tests
-test-unit:
-	@echo "--> Running unit tests"
-	@go test -covermode=atomic -coverprofile=coverage.txt `go list ./...`
-.PHONY: test-unit
+## vet: Run go vet
+vet: 
+	@echo "--> Running go vet"
+	@go vet $(pkgs)
+.PHONY: vet
 
-## test-unit-race: Running unit tests with data race detector
-test-unit-race:
-	@echo "--> Running unit tests with data race detector"
-	@go test -race -count=1 `go list ./...`
-.PHONY: test-unit-race
-
-## test-all: Run tests with and without data race
-test-all:
-	@$(MAKE) test-unit
-	@$(MAKE) test-unit-race
-.PHONY: test-all
+## test: Running unit tests
+test: vet
+	@echo "--> Running unit tests"
+	@go test -v -race -covermode=atomic -coverprofile=coverage.txt $(pkgs) -run $(run) -count=$(count)
+.PHONY: test
 
 ## proto-gen: Generate protobuf files. Requires docker.
 proto-gen:

README.md

@@ -72,13 +72,7 @@ The Rollkit v0.9.0 release is compatible with [Arabica](https://docs.celestia.or
 
 ```sh
 # Run unit tests
-make test-unit
-
-# Run unit tests with the data race detector
-make test-unit-race
-
-# Run tests with and without the data race detector
-make test-all
+make test
 
 # Generate protobuf files (requires Docker)
 make proto-gen