Skip to content

Commit 9199b20

Browse files
authored
Import applicationpb and committerpb from fabric-x-common (#226)
#### Type of change - Improvement (improvement to code, performance, etc) - Breaking change #### Description - Import `applicationpb` and `committerpb` from `fabric-x-common` #### Related issues - resolve #157 - resolve #158 Signed-off-by: Liran Funaro <[email protected]>
1 parent aca8b95 commit 9199b20

File tree

122 files changed

+170
-4037
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+170
-4037
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@ jobs:
2727

2828
- name: Lint
2929
run: |
30+
# Applying go.mod tidy rules and downloading dependencies.
31+
go mod tidy
3032
# Apply automatic formatting.
3133
gofmt -w .
3234
goimports -local "github.com/hyperledger/fabric-x-committer" -w .
33-
# Re make protobufs, overwriting any formatting
35+
# Re make protobufs, overwriting any formatting.
3436
PATH="$HOME/bin:$PATH" make proto
3537
# Check if original code changed due to formatting.
3638
git diff --exit-code

Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ multiplatform ?= false
5353
env ?= env GOOS=$(os) GOARCH=$(arch)
5454
build_flags ?= -buildvcs=false -o
5555
go_build ?= $(env) $(go_cmd) build $(build_flags)
56-
go_test ?= $(go_cmd) test -json -v -timeout 30m
56+
go_test ?= $(env) $(go_cmd) test -json -v -timeout 30m
5757
proto_flags ?=
5858

5959
ifneq ("$(wildcard /usr/include)","")
@@ -181,6 +181,8 @@ bench-sidecar: FORCE
181181
# Generate protos
182182
#########################
183183

184+
PROTO_COMMON="$(shell $(env) $(go_cmd) list -m -f '{{.Dir}}' github.com/hyperledger/fabric-x-common)"
185+
184186
proto: FORCE
185187
@echo "Generating protobufs: $(shell find ${project_dir}/api -name '*.proto' -print0 \
186188
| xargs -0 -n 1 dirname | xargs -n 1 basename | sort -u)"
@@ -189,13 +191,15 @@ proto: FORCE
189191
--go-grpc_opt=paths=source_relative \
190192
--go_out=paths=source_relative:. \
191193
--proto_path="${project_dir}" \
194+
--proto_path="${PROTO_COMMON}" \
192195
${proto_flags} \
193196
${project_dir}/api/*/*.proto
194197

195198
lint-proto: FORCE
196199
@echo "Running protobuf linters..."
197200
@api-linter \
198201
-I="${project_dir}/api" \
202+
-I="${PROTO_COMMON}" \
199203
--config .apilinter.yaml \
200204
--set-exit-status \
201205
--output-format github \

api/applicationpb/asn1.go

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)