From d297ea7dd83d431310c580b6d781442ab1dc81f7 Mon Sep 17 00:00:00 2001
From: Joubin Muhammad Houshyar <alphazero@sensesay.net>
Date: Thu, 9 Jun 2016 19:11:36 -0400
Subject: [PATCH] common: cleanup CopyBytes and associated test

---
 common/bytes.go      |  7 +------
 common/bytes_test.go | 19 +++++++++++++++----
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/common/bytes.go b/common/bytes.go
index 4fb016a976..0fd5fa6255 100644
--- a/common/bytes.go
+++ b/common/bytes.go
@@ -107,14 +107,9 @@ func ReadVarInt(buff []byte) (ret uint64) {
 	return
 }
 
-// Copy bytes
-//
 // Returns an exact copy of the provided bytes
 func CopyBytes(b []byte) (copiedBytes []byte) {
-	copiedBytes = make([]byte, len(b))
-	copy(copiedBytes, b)
-
-	return
+	return append([]byte{}, b...)
 }
 
 func HasHexPrefix(str string) bool {
diff --git a/common/bytes_test.go b/common/bytes_test.go
index 2e52084777..6b739ee622 100644
--- a/common/bytes_test.go
+++ b/common/bytes_test.go
@@ -76,10 +76,21 @@ func (s *BytesSuite) TestReadVarInt(c *checker.C) {
 }
 
 func (s *BytesSuite) TestCopyBytes(c *checker.C) {
-	data1 := []byte{1, 2, 3, 4}
-	exp1 := []byte{1, 2, 3, 4}
-	res1 := CopyBytes(data1)
-	c.Assert(res1, checker.DeepEquals, exp1)
+	data := [][]byte{
+		[]byte{0x00, 0x7f, 0x80, 0xff}, // interesting bytes
+		[]byte{},                       // empty case
+	}
+
+	// test
+	for i := 0; i < len(data); i++ {
+		have := CopyBytes(data[i])
+		if data[i] != nil {
+			// make sure we're not just returning the input arg
+			c.Assert(&have, checker.Not(checker.Equals), &data[i])
+		}
+		// verify deep copy
+		c.Assert(have, checker.DeepEquals, data[i])
+	}
 }
 
 func (s *BytesSuite) TestIsHex(c *checker.C) {