Merge a3c4236 into b1f0d19

.travis.yml

@@ -1,8 +1,7 @@
 language: go
-sudo: false
 go:
+- 1.14.x
 - 1.13.x
-- 1.12.x
 env:
 - GO111MODULE=off
 go_import_path: github.com/nats-io/nats.go
@@ -21,4 +20,4 @@ before_script:
 script:
 - go test -i -race ./...
 - go test -v -run=TestNoRace -p=1 ./...
-- if [[ "$TRAVIS_GO_VERSION" =~ 1.13 ]]; then ./scripts/cov.sh TRAVIS; else go test -race -v -p=1 ./... --failfast; fi
+- if [[ "$TRAVIS_GO_VERSION" =~ 1.14 ]]; then ./scripts/cov.sh TRAVIS; else go test -race -v -p=1 ./... --failfast; fi

encoders/protobuf/protobuf_enc.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2018 The NATS Authors
+// Copyright 2015-2020 The NATS Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -16,8 +16,8 @@ package protobuf
 import (
 	"errors"
 
-	"github.com/golang/protobuf/proto"
 	"github.com/nats-io/nats.go"
+	"google.golang.org/protobuf/proto"
 )
 
 // Additional index for registered Encoders.

test/protobuf_test.go

@@ -1,4 +1,4 @@
-// Copyright 2015-2019 The NATS Authors
+// Copyright 2015-2020 The NATS Authors
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -14,6 +14,7 @@
 package test
 
 import (
+	"errors"
 	"reflect"
 	"testing"
 	"time"
@@ -38,24 +39,30 @@ func TestEncProtoMarshalStruct(t *testing.T) {
 
 	ec := NewProtoEncodedConn(t)
 	defer ec.Close()
-	ch := make(chan bool)
 
 	me := &pb.Person{Name: "derek", Age: 22, Address: "140 New Montgomery St"}
 	me.Children = make(map[string]*pb.Person)
 
 	me.Children["sam"] = &pb.Person{Name: "sam", Age: 19, Address: "140 New Montgomery St"}
 	me.Children["meg"] = &pb.Person{Name: "meg", Age: 17, Address: "140 New Montgomery St"}
 
+	ch := make(chan error, 1)
 	ec.Subscribe("protobuf_test", func(p *pb.Person) {
-		if !reflect.DeepEqual(p, me) {
-			t.Fatal("Did not receive the correct protobuf response")
+		var err error
+		if !reflect.DeepEqual(p.ProtoReflect(), me.ProtoReflect()) {
+			err = errors.New("Did not receive the correct protobuf response")
 		}
-		ch <- true
+		ch <- err
 	})
 
 	ec.Publish("protobuf_test", me)
-	if e := Wait(ch); e != nil {
-		t.Fatal("Did not receive the message")
+	select {
+	case e := <-ch:
+		if e != nil {
+			t.Fatal(e.Error())
+		}
+	case <-time.After(time.Second):
+		t.Fatal("Failed to receive message")
 	}
 }
 
@@ -83,7 +90,7 @@ func TestEncProtoNilRequest(t *testing.T) {
 		t.Error("Fail to send empty message via encoded proto connection")
 	}
 
-	if !reflect.DeepEqual(testPerson, resp) {
+	if !reflect.DeepEqual(testPerson.ProtoReflect(), resp.ProtoReflect()) {
 		t.Error("Fail to receive encoded response")
 	}
 }