From e23eb5bfff399abfd9232ae0d9e2fb3865ffdb81 Mon Sep 17 00:00:00 2001
From: Ruslan Efanov <rus.efanov@bk.ru>
Date: Thu, 22 Apr 2021 17:00:24 +0300
Subject: [PATCH] fixed review

---
 v5/error_test.go | 16 +++++++++++++---
 v5/marshaling.go |  4 +++-
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/v5/error_test.go b/v5/error_test.go
index 27194f8..989b8e3 100644
--- a/v5/error_test.go
+++ b/v5/error_test.go
@@ -8,9 +8,15 @@ import (
 )
 
 func TestFailure_ApiErrorsSlice(t *testing.T) {
-	b := []byte(`{"success": false, "errorMsg": "Failed to activate module", "errors": ["Your account has insufficient funds to activate integration module"]}`)
+	b := []byte(`{"success": false,
+				"errorMsg": "Failed to activate module",
+				"errors": [
+					"Your account has insufficient funds to activate integration module",
+					"Test error"
+				]}`)
 	expected := APIErrorsList{
 		"0": "Your account has insufficient funds to activate integration module",
+		"1": "Test error",
 	}
 
 	var expEr *APIError
@@ -26,9 +32,13 @@ func TestFailure_ApiErrorsSlice(t *testing.T) {
 }
 
 func TestFailure_ApiErrorsMap(t *testing.T) {
-	b := []byte(`{"success": false, "errorMsg": "Failed to activate module", "errors": {"id": "ID must be an integer"}}`)
+	b := []byte(`{"success": false,
+				"errorMsg": "Failed to activate module",
+				"errors": {"id": "ID must be an integer", "test": "Test error"}}`,
+	)
 	expected := APIErrorsList{
-		"id": "ID must be an integer",
+		"id":   "ID must be an integer",
+		"test": "Test error",
 	}
 
 	var expEr *APIError
diff --git a/v5/marshaling.go b/v5/marshaling.go
index 34f762d..15cfd50 100644
--- a/v5/marshaling.go
+++ b/v5/marshaling.go
@@ -12,17 +12,19 @@ func (t Tag) MarshalJSON() ([]byte, error) {
 
 func (a *APIErrorsList) UnmarshalJSON(data []byte) error {
 	var i interface{}
+	var m map[string]string
 	if err := json.Unmarshal(data, &i); err != nil {
 		return err
 	}
 
-	m := make(map[string]string)
 	switch e := i.(type) {
 	case map[string]interface{}:
+		m = make(map[string]string, len(e))
 		for idx, val := range e {
 			m[idx] = fmt.Sprint(val)
 		}
 	case []interface{}:
+		m = make(map[string]string, len(e))
 		for idx, val := range e {
 			m[strconv.Itoa(idx)] = fmt.Sprint(val)
 		}