From cb12010c869a72ce40b90cad1938e05c1773eb53 Mon Sep 17 00:00:00 2001
From: Menghan Li <menghanl@google.com>
Date: Wed, 15 Jun 2016 14:28:00 -0700
Subject: [PATCH] Remove return value idxs []int from fileDescForType()

---
 reflection/serverreflection.go      | 17 +++++++++--------
 reflection/serverreflection_test.go | 15 +++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/reflection/serverreflection.go b/reflection/serverreflection.go
index a474901a..83d0edf9 100644
--- a/reflection/serverreflection.go
+++ b/reflection/serverreflection.go
@@ -83,19 +83,20 @@ type protoMessage interface {
 	Descriptor() ([]byte, []int)
 }
 
-// fileDescForType gets the file descriptor and indexes for the given type.
-func (s *serverReflectionServer) fileDescForType(st reflect.Type) (*dpb.FileDescriptorProto, []int, error) {
+// fileDescForType gets the file descriptor for the given type.
+// The given type should be a proto message.
+func (s *serverReflectionServer) fileDescForType(st reflect.Type) (*dpb.FileDescriptorProto, error) {
 	m, ok := reflect.Zero(reflect.PtrTo(st)).Interface().(protoMessage)
 	if !ok {
-		return nil, nil, fmt.Errorf("failed to create message from type: %v", st)
+		return nil, fmt.Errorf("failed to create message from type: %v", st)
 	}
-	enc, idxs := m.Descriptor()
+	enc, _ := m.Descriptor()
 
 	fd, err := s.decodeFileDesc(enc)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
-	return fd, idxs, nil
+	return fd, nil
 }
 
 // decodeFileDesc does decompression and unmarshalling on the given
@@ -158,7 +159,7 @@ func (s *serverReflectionServer) fileDescContainingExtension(st reflect.Type, ex
 
 	extT := reflect.TypeOf(extDesc.ExtensionType).Elem()
 
-	fd, _, err := s.fileDescForType(extT)
+	fd, err := s.fileDescForType(extT)
 	if err != nil {
 		return nil, err
 	}
@@ -207,7 +208,7 @@ func (s *serverReflectionServer) fileDescWireFormatContainingSymbol(name string)
 	)
 	// Check if it's a type name.
 	if st, err := s.typeForName(name); err == nil {
-		fd, _, err = s.fileDescForType(st)
+		fd, err = s.fileDescForType(st)
 		if err != nil {
 			return nil, err
 		}
diff --git a/reflection/serverreflection_test.go b/reflection/serverreflection_test.go
index 7d1ba6b8..b06c4d52 100644
--- a/reflection/serverreflection_test.go
+++ b/reflection/serverreflection_test.go
@@ -51,16 +51,15 @@ func init() {
 
 func TestFileDescForType(t *testing.T) {
 	for _, test := range []struct {
-		st      reflect.Type
-		wantFd  *dpb.FileDescriptorProto
-		wantIdx []int
+		st     reflect.Type
+		wantFd *dpb.FileDescriptorProto
 	}{
-		{reflect.TypeOf(pb.SearchResponse_Result{}), fdTest, []int{0, 0}},
-		{reflect.TypeOf(pb.ToBeExtened{}), fdProto2, []int{0}},
+		{reflect.TypeOf(pb.SearchResponse_Result{}), fdTest},
+		{reflect.TypeOf(pb.ToBeExtened{}), fdProto2},
 	} {
-		fd, idx, err := s.fileDescForType(test.st)
-		if err != nil || !reflect.DeepEqual(fd, test.wantFd) || !reflect.DeepEqual(idx, test.wantIdx) {
-			t.Fatalf("fileDescForType(%q) = %q, %v, %v, want %q, %v, <nil>", test.st, fd, idx, err, test.wantFd, test.wantIdx)
+		fd, err := s.fileDescForType(test.st)
+		if err != nil || !reflect.DeepEqual(fd, test.wantFd) {
+			t.Fatalf("fileDescForType(%q) = %q, %v, want %q, <nil>", test.st, fd, err, test.wantFd)
 		}
 	}
 }