From 4813c34f3601bd3fc1c01b152b7f6fa75bf04bf6 Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Sat, 2 Jul 2016 22:57:16 +0100
Subject: [PATCH] Simplify error message from Decode()

---
 base58.go      | 10 +++-------
 base58_test.go |  4 +---
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/base58.go b/base58.go
index dd1c181..d0d43b7 100644
--- a/base58.go
+++ b/base58.go
@@ -2,7 +2,6 @@ package base58
 
 import (
 	"errors"
-	"fmt"
 	"strings"
 )
 
@@ -10,6 +9,8 @@ import (
 const Alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
 const base = len(Alphabet)
 
+var errInvalidBase58 = errors.New("invalid base58")
+
 // Encode converts a base10 integer to a base58 string using the default
 // alphabet.
 func Encode(num int) string {
@@ -33,7 +34,7 @@ func Decode(str string) (int, error) {
 		char := string(str[i-1])
 		index := strings.Index(Alphabet, char)
 		if index == -1 {
-			return -1, decodeError(str)
+			return -1, errInvalidBase58
 		}
 		num += multi * index
 		multi = multi * base
@@ -41,8 +42,3 @@ func Decode(str string) (int, error) {
 
 	return num, nil
 }
-
-func decodeError(str string) error {
-	msg := fmt.Sprintf("\"%s\" is not a valid base58 string.", str)
-	return errors.New(msg)
-}
diff --git a/base58_test.go b/base58_test.go
index 4edc174..999ed36 100644
--- a/base58_test.go
+++ b/base58_test.go
@@ -1,7 +1,6 @@
 package base58
 
 import (
-	"errors"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -206,12 +205,11 @@ func (s *Base58Suite) TestDecode() {
 
 func (s *Base58Suite) TestDecodeError() {
 	assert := assert.New(s.T())
-	errMsg := "\"invalid@base58.string\" is not a valid base58 string."
 
 	result, err := Decode("invalid@base58.string")
 
 	assert.Equal(-1, result)
-	assert.Equal(errors.New(errMsg), err)
+	assert.Equal("invalid base58", err.Error())
 }
 
 func TestBase58Suite(t *testing.T) {