Merge branch 'conversion' into develop

3 files changed, 20 insertions, 18 deletions

diff --git a/blockpool/test/hash_pool.go b/blockpool/test/hash_pool.go
index 4e0332d7d..df3c750f9 100644
--- a/blockpool/test/hash_pool.go
+++ b/blockpool/test/hash_pool.go
@@ -3,20 +3,10 @@ package test
 import (
 	"sync"
 
+	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/crypto"
 )
 
-// test helpers
-// TODO: move into common test helper package (see p2p/crypto etc.)
-
-func NewHashPool() *TestHashPool {
-	return &TestHashPool{intToHash: make(intToHash), hashToInt: make(hashToInt)}
-}
-
-type intToHash map[int][]byte
-
-type hashToInt map[string]int
-
 // hashPool is a test helper, that allows random hashes to be referred to by integers
 type TestHashPool struct {
 	intToHash
@@ -24,11 +14,19 @@ type TestHashPool struct {
 	lock sync.Mutex
 }
 
-func newHash(i int) []byte {
-	return crypto.Sha3([]byte(string(i)))
+func NewHashPool() *TestHashPool {
+	return &TestHashPool{intToHash: make(intToHash), hashToInt: make(hashToInt)}
+}
+
+type intToHash map[int]common.Hash
+
+type hashToInt map[common.Hash]int
+
+func newHash(i int) common.Hash {
+	return common.BytesToHash(crypto.Sha3([]byte(string(i))))
 }
 
-func (self *TestHashPool) IndexesToHashes(indexes []int) (hashes [][]byte) {
+func (self *TestHashPool) IndexesToHashes(indexes []int) (hashes []common.Hash) {
 	self.lock.Lock()
 	defer self.lock.Unlock()
 	for _, i := range indexes {
@@ -36,18 +34,18 @@ func (self *TestHashPool) IndexesToHashes(indexes []int) (hashes [][]byte) {
 		if !found {
 			hash = newHash(i)
 			self.intToHash[i] = hash
-			self.hashToInt[string(hash)] = i
+			self.hashToInt[hash] = i
 		}
 		hashes = append(hashes, hash)
 	}
 	return
 }
 
-func (self *TestHashPool) HashesToIndexes(hashes [][]byte) (indexes []int) {
+func (self *TestHashPool) HashesToIndexes(hashes []common.Hash) (indexes []int) {
 	self.lock.Lock()
 	defer self.lock.Unlock()
 	for _, hash := range hashes {
-		i, found := self.hashToInt[string(hash)]
+		i, found := self.hashToInt[hash]
 		if !found {
 			i = -1
 		}
diff --git a/blockpool/test/logger.go b/blockpool/test/logger.go
index 8b776e0b5..bcb4d4cb3 100644
--- a/blockpool/test/logger.go
+++ b/blockpool/test/logger.go
@@ -9,6 +9,8 @@ import (
 	"github.com/ethereum/go-ethereum/logger"
 )
 
+// logging in tests
+
 var once sync.Once
 
 /* usage:
@@ -19,7 +21,7 @@ func TestFunc(t *testing.T) {
 */
 func LogInit() {
 	once.Do(func() {
-		var logsys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.DebugDetailLevel))
+		var logsys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.WarnLevel))
 		logger.AddLogSystem(logsys)
 	})
 }
diff --git a/blockpool/test/util.go b/blockpool/test/util.go
index e183bf1d1..0349493c3 100644
--- a/blockpool/test/util.go
+++ b/blockpool/test/util.go
@@ -6,6 +6,8 @@ import (
 	"time"
 )
 
+// miscellaneous test helpers
+
 func CheckInt(name string, got int, expected int, t *testing.T) (err error) {
 	if got != expected {
 		t.Errorf("status for %v incorrect. expected %v, got %v", name, expected, got)