trie: run codec tests, add benchmarks, faster

1 files changed, 54 insertions, 4 deletions

diff --git a/trie/encoding_test.go b/trie/encoding_test.go
index faaa7f583..e49b57ef0 100644
--- a/trie/encoding_test.go
+++ b/trie/encoding_test.go
@@ -17,9 +17,14 @@
 package trie
 
 import (
+	"encoding/hex"
+	"testing"
+
 	checker "gopkg.in/check.v1"
 )
 
+func Test(t *testing.T) { checker.TestingT(t) }
+
 type TrieEncodingSuite struct{}
 
 var _ = checker.Suite(&TrieEncodingSuite{})
@@ -28,22 +33,22 @@ func (s *TrieEncodingSuite) TestCompactEncode(c *checker.C) {
 	// even compact encode
 	test1 := []byte{1, 2, 3, 4, 5}
 	res1 := CompactEncode(test1)
-	c.Assert(res1, checker.Equals, "\x11\x23\x45")
+	c.Assert(res1, checker.DeepEquals, []byte("\x11\x23\x45"))
 
 	// odd compact encode
 	test2 := []byte{0, 1, 2, 3, 4, 5}
 	res2 := CompactEncode(test2)
-	c.Assert(res2, checker.Equals, "\x00\x01\x23\x45")
+	c.Assert(res2, checker.DeepEquals, []byte("\x00\x01\x23\x45"))
 
 	//odd terminated compact encode
 	test3 := []byte{0, 15, 1, 12, 11, 8 /*term*/, 16}
 	res3 := CompactEncode(test3)
-	c.Assert(res3, checker.Equals, "\x20\x0f\x1c\xb8")
+	c.Assert(res3, checker.DeepEquals, []byte("\x20\x0f\x1c\xb8"))
 
 	// even terminated compact encode
 	test4 := []byte{15, 1, 12, 11, 8 /*term*/, 16}
 	res4 := CompactEncode(test4)
-	c.Assert(res4, checker.Equals, "\x3f\x1c\xb8")
+	c.Assert(res4, checker.DeepEquals, []byte("\x3f\x1c\xb8"))
 }
 
 func (s *TrieEncodingSuite) TestCompactHexDecode(c *checker.C) {
@@ -73,3 +78,48 @@ func (s *TrieEncodingSuite) TestCompactDecode(c *checker.C) {
 	res = CompactDecode([]byte("\x3f\x1c\xb8"))
 	c.Assert(res, checker.DeepEquals, exp)
 }
+
+func (s *TrieEncodingSuite) TestDecodeCompact(c *checker.C) {
+	exp, _ := hex.DecodeString("012345")
+	res := DecodeCompact([]byte{0, 1, 2, 3, 4, 5})
+	c.Assert(res, checker.DeepEquals, exp)
+
+	exp, _ = hex.DecodeString("012345")
+	res = DecodeCompact([]byte{0, 1, 2, 3, 4, 5, 16})
+	c.Assert(res, checker.DeepEquals, exp)
+
+	exp, _ = hex.DecodeString("abcdef")
+	res = DecodeCompact([]byte{10, 11, 12, 13, 14, 15})
+	c.Assert(res, checker.DeepEquals, exp)
+}
+
+func BenchmarkCompactEncode(b *testing.B) {
+
+	testBytes := []byte{0, 15, 1, 12, 11, 8 /*term*/, 16}
+	for i := 0; i < b.N; i++ {
+		CompactEncode(testBytes)
+	}
+}
+
+func BenchmarkCompactDecode(b *testing.B) {
+	testBytes := []byte{0, 15, 1, 12, 11, 8 /*term*/, 16}
+	for i := 0; i < b.N; i++ {
+		CompactDecode(testBytes)
+	}
+}
+
+func BenchmarkCompactHexDecode(b *testing.B) {
+	testBytes := []byte{7, 6, 6, 5, 7, 2, 6, 2, 16}
+	for i := 0; i < b.N; i++ {
+		CompactHexDecode(testBytes)
+	}
+
+}
+
+func BenchmarkDecodeCompact(b *testing.B) {
+	testBytes := []byte{7, 6, 6, 5, 7, 2, 6, 2, 16}
+	for i := 0; i < b.N; i++ {
+		DecodeCompact(testBytes)
+	}
+
+}