Skip to content
This repository has been archived by the owner on Dec 7, 2019. It is now read-only.

update gogo protobuf #37

Merged
merged 2 commits into from
Aug 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gx/lastpubver
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.0: Qmb3LkKPWhoUgzm421xmv3g8LaptZEgN1bKBVPZhakfsTC
2.0.1: QmPvyPwuCgJ7pDmrKDxRtsScJgBaM5h4EpRL2qQJsmXf4n
4 changes: 2 additions & 2 deletions key.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ func UnmarshalPublicKey(data []byte) (PubKey, error) {
// public key
func MarshalPublicKey(k PubKey) ([]byte, error) {
pbmes := new(pb.PublicKey)
pbmes.Type = k.Type().Enum()
pbmes.Type = k.Type()
data, err := k.Raw()
if err != nil {
return nil, err
Expand Down Expand Up @@ -302,7 +302,7 @@ func UnmarshalPrivateKey(data []byte) (PrivKey, error) {
// MarshalPrivateKey converts a key object into its protobuf serialized form.
func MarshalPrivateKey(k PrivKey) ([]byte, error) {
pbmes := new(pb.PrivateKey)
pbmes.Type = k.Type().Enum()
pbmes.Type = k.Type()
data, err := k.Raw()
if err != nil {
return nil, err
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"gxDependencies": [
{
"author": "whyrusleeping",
"hash": "QmZ4Qi3GaRbjcx28Sme5eMH7RQjGkt8wHxt2a65oLaeFEV",
"hash": "QmdxUuburamoF6zF9qjeQC4WYcWGbWuRmdLacMEsW8ioD8",
"name": "gogo-protobuf",
"version": "0.0.0"
},
Expand Down Expand Up @@ -37,6 +37,6 @@
"license": "MIT",
"name": "go-libp2p-crypto",
"releaseCmd": "git commit -a -m \"gx publish $VERSION\"",
"version": "2.0.0"
"version": "2.0.1"
}

5 changes: 3 additions & 2 deletions pb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ GO = $(PB:.proto=.pb.go)
all: $(GO)

%.pb.go: %.proto
protoc --gogo_out=. $<
protoc --proto_path=$(GOPATH)/src:. --gogofaster_out=. $<

clean:
rm *.pb.go
rm -f *.pb.go
rm -f *.go
Loading