SSR-2417: resolve conflict

app.go

@@ -455,7 +455,7 @@ func (app *App) GetAllRecords(fields []string) ([]*Record, error) {
 		if err != nil {
 			return nil, err
 		}
-		r, _, err := DecodeRecords(body)
+		r, err := DecodeRecords(body)
 		if err != nil {
 			return nil, ErrInvalidResponse
 		}

app_test.go

@@ -202,8 +202,6 @@ func handleResponseGetRecords(response http.ResponseWriter, request *http.Reques
 	}
 }
 
-//end
-
 func handleResponseGetRecordsComments(response http.ResponseWriter, request *http.Request) {
 	checkAuth(response, request)
 	checkContentType(response, request)

cursor.go

@@ -32,7 +32,7 @@ func DecodeGetRecordsCursorResponse(b []byte) (rc *GetRecordsCursorResponse, err
 	if err != nil {
 		return nil, err
 	}
-	listRecord, _, err := DecodeRecords(b)
+	listRecord, err := DecodeRecords(b)
 	if err != nil {
 		return nil, err
 	}

record.go

@@ -322,25 +322,24 @@ func decodeRecordData(data recordData) (*Record, error) {
 }
 
 // DecodeRecords decodes JSON response for multi-get API.
-func DecodeRecords(b []byte) ([]*Record, string, error) {
+func DecodeRecords(b []byte) ([]*Record, error) {
 	var t struct {
-		Records    []recordData `json:"records"`
-		TotalCount string       `json:"total_count"`
+		Records []recordData `json:"records"`
 	}
 	err := json.Unmarshal(b, &t)
 	if err != nil {
-		return nil, "", errors.New("Invalid JSON format")
+		return nil, errors.New("Invalid JSON format")
 	}
 
 	rec_list := make([]*Record, len(t.Records))
 	for i, rd := range t.Records {
 		r, err := decodeRecordData(rd)
 		if err != nil {
-			return nil, "", err
+			return nil, err
 		}
 		rec_list[i] = r
 	}
-	return rec_list, t.TotalCount, nil
+	return rec_list, nil
 }
 
 func DecodeRecordsWithTotalCount(b []byte) ([]*Record, string, error) {

record_test.go

@@ -371,7 +371,7 @@ func TestDecodeRecords(t *testing.T) {
         }
     ]
 }`)
-	rec, _, err := DecodeRecords(j)
+	rec, err := DecodeRecords(j)
 	if err != nil {
 		t.Fatal(err)
 	}