review comments

cmd/protoc-gen-go-grpc/grpc.go

@@ -29,7 +29,6 @@ import (
 )
 
 const (
-	errorsPackage  = protogen.GoImportPath("errors")
 	contextPackage = protogen.GoImportPath("context")
 	grpcPackage    = protogen.GoImportPath("google.golang.org/grpc")
 	codesPackage   = protogen.GoImportPath("google.golang.org/grpc/codes")
@@ -136,6 +135,18 @@ func genClientMethod(gen *protogen.Plugin, g *protogen.GeneratedFile, method *pr
 	if method.Desc.Options().(*descriptorpb.MethodOptions).GetDeprecated() {
 		g.P(deprecationComment)
 	}
+
+	streamDescName := unexport(service.GoName) + method.GoName + "StreamDesc"
+	g.P("var ", streamDescName, " = &", grpcPackage.Ident("StreamDesc"), "{")
+	g.P("StreamName: ", strconv.Quote(string(method.Desc.Name())), ",")
+	if method.Desc.IsStreamingServer() {
+		g.P("ServerStreams: true,")
+	}
+	if method.Desc.IsStreamingClient() {
+		g.P("ClientStreams: true,")
+	}
+	g.P("}")
+
 	g.P("func (c *", unexport(service.GoName), "Client) ", clientSignature(g, method), "{")
 	if !method.Desc.IsStreamingServer() && !method.Desc.IsStreamingClient() {
 		g.P("out := new(", method.Output.GoIdent, ")")
@@ -148,17 +159,7 @@ func genClientMethod(gen *protogen.Plugin, g *protogen.GeneratedFile, method *pr
 	}
 	streamType := unexport(service.GoName) + method.GoName + "Client"
 
-	g.P("streamDesc := &", grpcPackage.Ident("StreamDesc"), "{")
-	g.P("StreamName: ", strconv.Quote(string(method.Desc.Name())), ",")
-	if method.Desc.IsStreamingServer() {
-		g.P("ServerStreams: true,")
-	}
-	if method.Desc.IsStreamingClient() {
-		g.P("ClientStreams: true,")
-	}
-	g.P("}")
-
-	g.P(`stream, err := c.cc.NewStream(ctx, streamDesc, "`, sname, `", opts...)`)
+	g.P(`stream, err := c.cc.NewStream(ctx, `, streamDescName, `, "`, sname, `", opts...)`)
 	g.P("if err != nil { return nil, err }")
 	g.P("x := &", streamType, "{stream}")
 	if !method.Desc.IsStreamingClient() {
@@ -384,12 +385,12 @@ func handlerSignature(g *protogen.GeneratedFile, method *protogen.Method) string
 }
 
 func unaryHandlerSignature(g *protogen.GeneratedFile) string {
-	return "(srv interface{}, ctx " + g.QualifiedGoIdent(contextPackage.Ident("Context")) +
+	return "(_ interface{}, ctx " + g.QualifiedGoIdent(contextPackage.Ident("Context")) +
 		", dec func(interface{}) error, interceptor " + g.QualifiedGoIdent(grpcPackage.Ident("UnaryServerInterceptor")) + ") (interface{}, error)"
 }
 
 func streamHandlerSignature(g *protogen.GeneratedFile) string {
-	return "(srv interface{}, stream " + g.QualifiedGoIdent(grpcPackage.Ident("ServerStream")) + ") error"
+	return "(_ interface{}, stream " + g.QualifiedGoIdent(grpcPackage.Ident("ServerStream")) + ") error"
 }
 
 func genMethodHandler(gen *protogen.Plugin, g *protogen.GeneratedFile, method *protogen.Method) {

examples/features/reflection/server/main.go

@@ -40,7 +40,7 @@ func sayHello(ctx context.Context, in *hwpb.HelloRequest) (*hwpb.HelloReply, err
 	return &hwpb.HelloReply{Message: "Hello " + in.Name}, nil
 }
 
-// unaryEcho implementes echo.Echo.UnaryEcho
+// unaryEcho implements echo.Echo.UnaryEcho
 func unaryEcho(ctx context.Context, req *ecpb.EchoRequest) (*ecpb.EchoResponse, error) {
 	return &ecpb.EchoResponse{Message: req.Message}, nil
 }

go.mod

@@ -6,11 +6,10 @@ require (
 	github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f
 	github.com/envoyproxy/go-control-plane v0.9.4
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/golang/protobuf v1.4.2
+	github.com/golang/protobuf v1.3.3
 	github.com/google/go-cmp v0.4.0
 	golang.org/x/net v0.0.0-20190311183353-d8887717615a
 	golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be
 	golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a
-	google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad
-	google.golang.org/grpc/examples v0.0.0-20200811135751-6aaac03d175a // indirect
+	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55
 )