opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix golint errors for non-generated code

Browse Source
This commit is contained in:
Peter Edge
2015-05-08 21:46:16 +02:00
parent 5a3d0652b6
commit 5700d19d0e
6 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/benchmark.go
View File

@ -137,7 +137,7 @@ func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServ
} }
func (s *testServer) HalfDuplexCall(stream testpb.TestService_HalfDuplexCallServer) error { func (s *testServer) HalfDuplexCall(stream testpb.TestService_HalfDuplexCallServer) error {
msgBuf := make([]*testpb.StreamingOutputCallRequest, 0) var msgBuf []*testpb.StreamingOutputCallRequest
for { for {
in, err := stream.Recv() in, err := stream.Recv()
if err == io.EOF { if err == io.EOF {

4
benchmark/stats/counter.go
View File

@ -6,8 +6,8 @@ import (
) )
var ( var (
// Used for testing. // TimeNow is used for testing.
TimeNow func() time.Time = time.Now TimeNow = time.Now
) )
const ( const (

1
credentials/credentials.go
View File

@ -202,6 +202,7 @@ type TokenSource struct {
oauth2.TokenSource oauth2.TokenSource
} }
// GetRequestMetadata gets the request metadata as a map from a TokenSource.
func (ts TokenSource) GetRequestMetadata(ctx context.Context) (map[string]string, error) { func (ts TokenSource) GetRequestMetadata(ctx context.Context) (map[string]string, error) {
token, err := ts.Token() token, err := ts.Token()
if err != nil { if err != nil {

6
interop/client/client.go
View File

@ -47,8 +47,8 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/metadata"
testpb "google.golang.org/grpc/interop/grpc_testing" testpb "google.golang.org/grpc/interop/grpc_testing"
"google.golang.org/grpc/metadata"
) )
var ( var (
@ -268,7 +268,7 @@ func doComputeEngineCreds(tc testpb.TestServiceClient) {
log.Println("ComputeEngineCreds done") log.Println("ComputeEngineCreds done")
} }
func getServiceAccountJsonKey() []byte { func getServiceAccountJSONKey() []byte {
jsonKey, err := ioutil.ReadFile(*serviceAccountKeyFile) jsonKey, err := ioutil.ReadFile(*serviceAccountKeyFile)
if err != nil { if err != nil {
log.Fatalf("Failed to read the service account key file: %v", err) log.Fatalf("Failed to read the service account key file: %v", err)
@ -289,7 +289,7 @@ func doServiceAccountCreds(tc testpb.TestServiceClient) {
if err != nil { if err != nil {
log.Fatal("/TestService/UnaryCall RPC failed: ", err) log.Fatal("/TestService/UnaryCall RPC failed: ", err)
} }
jsonKey := getServiceAccountJsonKey() jsonKey := getServiceAccountJSONKey()
user := reply.GetUsername() user := reply.GetUsername()
scope := reply.GetOauthScope() scope := reply.GetOauthScope()
if !strings.Contains(string(jsonKey), user) { if !strings.Contains(string(jsonKey), user) {

2
interop/server/server.go
View File

@ -156,7 +156,7 @@ func (s *testServer) FullDuplexCall(stream testpb.TestService_FullDuplexCallServ
} }
func (s *testServer) HalfDuplexCall(stream testpb.TestService_HalfDuplexCallServer) error { func (s *testServer) HalfDuplexCall(stream testpb.TestService_HalfDuplexCallServer) error {
msgBuf := make([]*testpb.StreamingOutputCallRequest, 0) var msgBuf []*testpb.StreamingOutputCallRequest
for { for {
in, err := stream.Recv() in, err := stream.Recv()
if err == io.EOF { if err == io.EOF {

4
transport/transport_test.go
View File

@ -438,7 +438,7 @@ func TestServerWithMisbehavedClient(t *testing.T) {
time.Sleep(time.Millisecond) time.Sleep(time.Millisecond)
continue continue
} }
for k, _ := range server.conns { for k := range server.conns {
var ok bool var ok bool
sc, ok = k.(*http2Server) sc, ok = k.(*http2Server)
if !ok { if !ok {
@ -493,7 +493,7 @@ func TestServerWithMisbehavedClient(t *testing.T) {
t.Fatalf("Failed to write data: %v", err) t.Fatalf("Failed to write data: %v", err)
} }
cc.writableChan <- 0 cc.writableChan <- 0
sent += 1 sent++
} }
// Server sent a resetStream for s already. // Server sent a resetStream for s already.
code := http2RSTErrConvTab[http2.ErrCodeFlowControl] code := http2RSTErrConvTab[http2.ErrCodeFlowControl]