use golang protobuf

ryanpenn · Mar 19, 2019 · cb49e2e · cb49e2e
1 parent ab8f485
commit cb49e2e
Show file tree

Hide file tree

Showing 46 changed files with 605 additions and 7,382 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/Gopkg.toml b/Gopkg.toml
@@ -26,8 +26,8 @@
 
 
 [[constraint]]
-  name = "github.com/gogo/protobuf"
-  version = "1.1.1"
+  name = "github.com/golang/protobuf"
+  version = "=1.2.0"
 
 [[constraint]]
   name = "github.com/gorilla/websocket"

diff --git a/Makefile b/Makefile
@@ -14,7 +14,7 @@ setup-ci:
 
 setup-protobuf-macos:
 	@brew install protobuf
-	@go get -u github.com/gogo/protobuf/protoc-gen-gogofaster
+	@go get github.com/golang/protobuf/protoc-gen-go
 
 run-chat-example:
 	@cd examples/testing && docker-compose up -d etcd nats && cd ../demo/chat/ && go run main.go
@@ -51,8 +51,8 @@ run-custom-metrics-example:
 
 protos-compile:
 	@cd benchmark/testdata && ./gen_proto.sh
-	@protoc -I pitaya-protos/ pitaya-protos/*.proto --gogofaster_out=plugins=grpc:protos
-	@protoc -I pitaya-protos/test pitaya-protos/test/*.proto --gogofaster_out=protos/test
+	@protoc -I pitaya-protos/ pitaya-protos/*.proto --go_out=plugins=grpc:protos
+	@protoc -I pitaya-protos/test pitaya-protos/test/*.proto --go_out=protos/test
 
 rm-test-temp-files:
 	@rm -f cluster/127.0.0.1* 127.0.0.1*

diff --git a/agent/agent_remote.go b/agent/agent_remote.go
@@ -25,7 +25,7 @@ import (
 	"net"
 	"reflect"
 
-	"github.com/gogo/protobuf/proto"
+	"github.com/golang/protobuf/proto"
 	"github.com/topfreegames/pitaya/cluster"
 	"github.com/topfreegames/pitaya/conn/codec"
 	"github.com/topfreegames/pitaya/conn/message"

diff --git a/benchmark/testdata/gen_proto.sh b/benchmark/testdata/gen_proto.sh
@@ -1 +1 @@
-protoc --gogofaster_out=. *.proto
+protoc --go_out . *.proto
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		protoc --gogofaster_out=. *.proto
		protoc --go_out . *.proto