From 738eb6b62fe9a30ddfe19934b0a22b1a66fbb661 Mon Sep 17 00:00:00 2001
From: lyuxuan <yuxuanli@google.com>
Date: Mon, 19 Mar 2018 14:19:42 -0700
Subject: [PATCH] fix minor typos and remove grpc.Codec related code in
 TestInterceptorCanAccessCallOptions (#1929)

---
 rpc_util.go          |  2 +-
 test/end2end_test.go | 10 ++--------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/rpc_util.go b/rpc_util.go
index 98cc8b7ca..de254a031 100644
--- a/rpc_util.go
+++ b/rpc_util.go
@@ -291,7 +291,7 @@ func PerRPCCredentials(creds credentials.PerRPCCredentials) CallOption {
 	return PerRPCCredsCallOption{Creds: creds}
 }
 
-// PerRPCCredsCallOption is a CallOption that indicates the the per-RPC
+// PerRPCCredsCallOption is a CallOption that indicates the per-RPC
 // credentials to use for the call.
 // This is an EXPERIMENTAL API.
 type PerRPCCredsCallOption struct {
diff --git a/test/end2end_test.go b/test/end2end_test.go
index 1dbc4ba50..4a7635222 100644
--- a/test/end2end_test.go
+++ b/test/end2end_test.go
@@ -1244,7 +1244,7 @@ func testFailFast(t *testing.T, e env) {
 	if _, err := tc.EmptyCall(ctx, &testpb.Empty{}); err != nil {
 		t.Fatalf("TestService/EmptyCall(_, _) = _, %v, want _, <nil>", err)
 	}
-	// Stop the server and tear down all the exisiting connections.
+	// Stop the server and tear down all the existing connections.
 	te.srv.Stop()
 	// Loop until the server teardown is propagated to the client.
 	for {
@@ -5901,7 +5901,6 @@ func TestInterceptorCanAccessCallOptions(t *testing.T) {
 		maxSendSize []int
 		compressor  []string
 		subtype     []string
-		codec       []grpc.Codec
 	}
 	var observedOpts observedOptions
 	populateOpts := func(opts []grpc.CallOption) {
@@ -5925,8 +5924,6 @@ func TestInterceptorCanAccessCallOptions(t *testing.T) {
 				observedOpts.compressor = append(observedOpts.compressor, o.CompressorType)
 			case grpc.ContentSubtypeCallOption:
 				observedOpts.subtype = append(observedOpts.subtype, o.ContentSubtype)
-			case grpc.CustomCodecCallOption:
-				observedOpts.codec = append(observedOpts.codec, o.Codec)
 			}
 		}
 	}
@@ -5972,20 +5969,17 @@ func TestInterceptorCanAccessCallOptions(t *testing.T) {
 
 	observedOpts = observedOptions{} // reset
 
-	var codec errCodec
 	tc.StreamingInputCall(context.Background(),
 		grpc.FailFast(true),
 		grpc.MaxCallSendMsgSize(2020),
 		grpc.UseCompressor("comp-type"),
-		grpc.CallContentSubtype("json"),
-		grpc.CallCustomCodec(&codec))
+		grpc.CallContentSubtype("json"))
 	expected = observedOptions{
 		failFast:    []bool{false, true},
 		maxRecvSize: []int{1010},
 		maxSendSize: []int{2020},
 		compressor:  []string{"comp-type"},
 		subtype:     []string{"json"},
-		codec:       []grpc.Codec{&codec},
 	}
 
 	if !reflect.DeepEqual(expected, observedOpts) {