Merge changes I8e61cedf,I696f3f3d

* changes: Do not make protos in gotools dir Fix linting errors
hyperledger · Nov 9, 2016 · 1950782 · 1950782
2 parents 77cabfc + 145dfd3
commit 1950782
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/orderer/sbft/backend/backendab.go b/orderer/sbft/backend/backendab.go
@@ -44,7 +44,7 @@ func (b *BackendAB) Broadcast(srv ab.AtomicBroadcast_BroadcastServer) error {
 		}
 
 		if envelope.Payload == nil {
-			err = srv.Send(&ab.BroadcastResponse{ab.Status_BAD_REQUEST})
+			err = srv.Send(&ab.BroadcastResponse{Status: ab.Status_BAD_REQUEST})
 			if err != nil {
 				return err
 			}
@@ -54,7 +54,7 @@ func (b *BackendAB) Broadcast(srv ab.AtomicBroadcast_BroadcastServer) error {
 			panic(err)
 		}
 		b.backend.enqueueRequest(req)
-		err = srv.Send(&ab.BroadcastResponse{ab.Status_SUCCESS})
+		err = srv.Send(&ab.BroadcastResponse{Status: ab.Status_SUCCESS})
 		if err != nil {
 			return err
 		}

diff --git a/scripts/compile_protos.sh b/scripts/compile_protos.sh
@@ -11,10 +11,11 @@ PROTO_ROOT_FILES="$(find . -name ".protoroot" -exec readlink -f {} \;)"
 PROTO_ROOT_DIRS="$(dirname $PROTO_ROOT_FILES)"
 
 
-# Find all proto files to be compiled, excluding any which are in a proto root or in the vendor folder
+# Find all proto files to be compiled, excluding any which are in a proto root or in the vendor folder, as well as the gotools dir
 ROOTLESS_PROTO_FILES="$(find $PWD \
                              $(for dir in $PROTO_ROOT_DIRS ; do echo "-path $dir -prune -o " ; done) \
                              -path $PWD/vendor -prune -o \
+                             -path $PWD/gotools -prune -o \
                              -name "*.proto" -exec readlink -f {} \;)"
 ROOTLESS_PROTO_DIRS="$(dirname $ROOTLESS_PROTO_FILES | sort | uniq)"