From 2bc7347d6da4b91246d62f41a3e3dd7800a90e82 Mon Sep 17 00:00:00 2001
From: Darien Raymond <admin@v2ray.com>
Date: Sun, 4 Dec 2016 21:57:30 +0100
Subject: [PATCH] remove invalid uuid error

---
 common/uuid/uuid.go      | 6 ++----
 common/uuid/uuid_test.go | 4 ++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/common/uuid/uuid.go b/common/uuid/uuid.go
index 102cf12b..17f0bd27 100644
--- a/common/uuid/uuid.go
+++ b/common/uuid/uuid.go
@@ -10,8 +10,6 @@ import (
 
 var (
 	byteGroups = []int{8, 4, 4, 4, 12}
-
-	ErrInvalidID = errors.New("Invalid ID.")
 )
 
 type UUID [16]byte
@@ -74,7 +72,7 @@ func New() *UUID {
 // PraseBytes converts an UUID in byte form to object.
 func ParseBytes(b []byte) (*UUID, error) {
 	if len(b) != 16 {
-		return nil, ErrInvalidID
+		return nil, errors.New("Invalid UUID: ", b)
 	}
 	uuid := new(UUID)
 	copy(uuid[:], b)
@@ -85,7 +83,7 @@ func ParseBytes(b []byte) (*UUID, error) {
 func ParseString(str string) (*UUID, error) {
 	text := []byte(str)
 	if len(text) < 32 {
-		return nil, ErrInvalidID
+		return nil, errors.New("Invalid UUID: ", str)
 	}
 
 	uuid := new(UUID)
diff --git a/common/uuid/uuid_test.go b/common/uuid/uuid_test.go
index 147bf4ef..27d1e149 100644
--- a/common/uuid/uuid_test.go
+++ b/common/uuid/uuid_test.go
@@ -18,7 +18,7 @@ func TestParseBytes(t *testing.T) {
 	assert.String(uuid.String()).Equals(str)
 
 	_, err = ParseBytes([]byte{1, 3, 2, 4})
-	assert.Error(err).Equals(ErrInvalidID)
+	assert.Error(err).IsNotNil()
 }
 
 func TestParseString(t *testing.T) {
@@ -32,7 +32,7 @@ func TestParseString(t *testing.T) {
 	assert.Bytes(uuid.Bytes()).Equals(expectedBytes)
 
 	uuid, err = ParseString("2418d087")
-	assert.Error(err).Equals(ErrInvalidID)
+	assert.Error(err).IsNotNil()
 
 	uuid, err = ParseString("2418d087-648k-4990-86e8-19dca1d006d3")
 	assert.Error(err).IsNotNil()