Use chimera-api for protofiles (#18)

* Use chimera-api for protofiles

Signed-off-by: Puneetha <puneetha17@gmail.com>

* Fix testcases for protofiles in Chimera-API

Signed-off-by: Puneetha <puneetha17@gmail.com>

Makefile

@@ -11,23 +11,8 @@ IGNORED_PACKAGES := /vendor/
 .PHONY: all
 all: build
 
-protofiles: proto grpc
-
-proto:
-	$Q protoc -I protofiles/ \
-		-I $(GOPATH)/../vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
-		--go_out=plugins=grpc:protofiles \
-		protofiles/*.proto
-
-grpc:
-	$Q protoc -I protofiles/ \
-		-I $(GOPATH)/../vendor/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
-		--grpc-gateway_out=logtostderr=true:protofiles \
-		protofiles/grpc.proto
-
-
 .PHONY: build
-build: protofiles .GOPATH/.ok
+build: .GOPATH/.ok
 	$Q go install $(if $V,-v) $(VERSION_FLAGS) $(IMPORT_PATH)
 
 ### Code not in the repository root? Another binary? Add to the path like this.
@@ -41,7 +26,6 @@ build: protofiles .GOPATH/.ok
 
 clean:
 	$Q rm -rf bin .GOPATH
-	$Q rm -f server/*\.pb*
 
 test: .GOPATH/.ok
 	$Q go test $(if $V,-v) -i -race $(allpackages) # install -race libs to speed up next run
@@ -90,17 +74,9 @@ setup: clean .GOPATH/.ok
 	    echo "/.GOPATH" >> .gitignore; \
 	    echo "/bin" >> .gitignore; \
 	fi
-	$Q curl -OL https://github.com/google/protobuf/releases/download/v3.5.1/protoc-3.5.1-linux-x86_64.zip
-	$Q unzip protoc-3.5.1-linux-x86_64.zip -d protoc3
-	$Q mv protoc3/bin/* .GOPATH/bin/
-	$Q mv protoc3/include/* .GOPATH/include/
-	$Q rm -r protoc3
-	$Q rm protoc-3.5.1-linux-x86_64.zip
 	go get -u github.com/golang/dep/cmd/dep
 	go get -u golang.org/x/tools/cmd/goimports
 	go get -u github.com/wadey/gocovmerge
-	go get -u github.com/golang/protobuf/protoc-gen-go
-	go get -u github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway
 	@test -f Gopkg.toml || \
 		(cd $(CURDIR)/.GOPATH/src/$(IMPORT_PATH) && ./bin/dep init)
 	(cd $(CURDIR)/.GOPATH/src/$(IMPORT_PATH) && ./bin/dep ensure)

api/internal.go

@@ -13,7 +13,7 @@ import (
 	"encoding/json"
 	"net/http/httputil"
 	"fmt"
-	"github.com/blk-io/crux/protofiles"
+	"github.com/blk-io/chimera-api/protofiles"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"net/url"

server/proto_server.go

@@ -10,7 +10,7 @@ import (
 	"github.com/blk-io/crux/utils"
 	"net"
 	"google.golang.org/grpc/credentials"
-	"github.com/blk-io/crux/protofiles"
+	"github.com/blk-io/chimera-api/protofiles"
 )
 
 func (tm *TransactionManager) startRpcServer(port int, grpcJsonPort int, ipcPath string, tls bool, certFile, keyFile string) error {

server/server_handler.go

@@ -9,7 +9,7 @@ import (
 	"github.com/kevinburke/nacl"
 	"encoding/json"
 	"github.com/blk-io/crux/api"
-	"github.com/blk-io/crux/protofiles"
+	"github.com/blk-io/chimera-api/protofiles"
 )
 
 type Server struct {

server/server_test.go

@@ -12,7 +12,7 @@ import (
 	"github.com/kevinburke/nacl"
 	"github.com/blk-io/crux/enclave"
 	"github.com/blk-io/crux/storage"
-	"github.com/blk-io/crux/protofiles"
+	"github.com/blk-io/chimera-api/protofiles"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"path"