fix: add commands for generating go types (#16)

Co-authored-by: Rootul P <[email protected]>
celestiaorg · Jan 16, 2024 · 414d7f7 · 414d7f7
1 parent 2562fc6
commit 414d7f7
Show file tree

Hide file tree

Showing 12 changed files with 168 additions and 163 deletions.
diff --git a/Makefile b/Makefile
@@ -0,0 +1,14 @@
+DOCKER := $(shell which docker)
+DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.28.1
+
+## proto-gen-docker: Generate protobuf files. Requires docker.
+proto-gen:
+	@echo "--> Generating Protobuf files"
+	$(DOCKER_BUF) generate
+.PHONY: proto-gen-docker
+
+## proto-lint-docker: Lint protobuf files. Requires docker.
+proto-lint:
+	@echo "--> Linting Protobuf files"
+	@$(DOCKER_BUF) lint
+.PHONY: proto-lint
diff --git a/merkle/proto/buf.gen.yaml → buf.gen.yaml b/merkle/proto/buf.gen.yaml → buf.gen.yaml
@@ -1,6 +1,6 @@
 version: v1
 plugins:
   - plugin: buf.build/protocolbuffers/go
-    out: gen
+    out: .
     opt:
       - paths=source_relative
diff --git a/buf.yaml b/buf.yaml
@@ -1,9 +1,8 @@
 version: v1
-roots:
-  -proto
+name: buf.build/celestiaorg/go-square
 breaking:
   use:
     - FILE
 lint:
   use:
-    - DEFAULT
+    - BASIC
diff --git a/merkle/proof.go b/merkle/proof.go
@@ -6,7 +6,7 @@ import (
 	"errors"
 	"fmt"
 
-	wire "github.com/celestiaorg/go-square/merkle/proto/gen/merkle/v1"
+	wire "github.com/celestiaorg/go-square/merkle/proto"
 )
 
 const (

diff --git a/merkle/proof_op.go b/merkle/proof_op.go
@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	wire "github.com/celestiaorg/go-square/merkle/proto/gen/merkle/v1"
+	wire "github.com/celestiaorg/go-square/merkle/proto"
 )
 
 //----------------------------------------

diff --git a/merkle/proof_test.go b/merkle/proof_test.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"testing"
 
-	wire "github.com/celestiaorg/go-square/merkle/proto/gen/merkle/v1"
+	wire "github.com/celestiaorg/go-square/merkle/proto"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 	"google.golang.org/protobuf/proto"

diff --git a/merkle/proof_value.go b/merkle/proof_value.go
@@ -5,7 +5,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 
-	wire "github.com/celestiaorg/go-square/merkle/proto/gen/merkle/v1"
+	wire "github.com/celestiaorg/go-square/merkle/proto"
 	"google.golang.org/protobuf/proto"
 )
 

diff --git a/merkle/proto/gen/merkle/v1/proof.pb.go → merkle/proto/proof.pb.go b/merkle/proto/gen/merkle/v1/proof.pb.go → merkle/proto/proof.pb.go
diff --git a/merkle/proto/merkle/v1/proof.proto → merkle/proto/proof.proto b/merkle/proto/merkle/v1/proof.proto → merkle/proto/proof.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package square.merkle;
+package merkle.proto;
 
 option go_package = "github.com/celestiaorg/go-square/merkle";
 

diff --git a/pkg/blob/blob.pb.go b/pkg/blob/blob.pb.go
diff --git a/proto/celestia/core/v1/blob/blob.proto → pkg/blob/blob.proto b/proto/celestia/core/v1/blob/blob.proto → pkg/blob/blob.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package square.blob.v1;
+package pkg.blob;
 
 option go_package = "github.com/celestiaorg/go-square/pkg/blob";
 

diff --git a/proto/buf.gen.yaml b/proto/buf.gen.yaml
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ import ( @@
     	"errors"
     	"fmt"
-    	wire "github.com/celestiaorg/go-square/merkle/proto/gen/merkle/v1"
+    	wire "github.com/celestiaorg/go-square/merkle/proto"
     )
     const (
@@ Expand Down @@