aboutsummaryrefslogtreecommitdiffstats
path: root/blockpool/test/hash_pool.go
diff options
context:
space:
mode:
Diffstat (limited to 'blockpool/test/hash_pool.go')
-rw-r--r--blockpool/test/hash_pool.go17
1 files changed, 9 insertions, 8 deletions
diff --git a/blockpool/test/hash_pool.go b/blockpool/test/hash_pool.go
index 4e0332d7d..eea135af1 100644
--- a/blockpool/test/hash_pool.go
+++ b/blockpool/test/hash_pool.go
@@ -3,6 +3,7 @@ package test
import (
"sync"
+ "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/crypto"
)
@@ -13,9 +14,9 @@ func NewHashPool() *TestHashPool {
return &TestHashPool{intToHash: make(intToHash), hashToInt: make(hashToInt)}
}
-type intToHash map[int][]byte
+type intToHash map[int]common.Hash
-type hashToInt map[string]int
+type hashToInt map[common.Hash]int
// hashPool is a test helper, that allows random hashes to be referred to by integers
type TestHashPool struct {
@@ -24,11 +25,11 @@ type TestHashPool struct {
lock sync.Mutex
}
-func newHash(i int) []byte {
- return crypto.Sha3([]byte(string(i)))
+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 +37,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
}