Skip to content

Commit

Permalink
newHasher
Browse files Browse the repository at this point in the history
  • Loading branch information
@timwu20
timwu20 committed Sep 23, 2021
1 parent 8fbaa26 commit 3c60752
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
4 changes: 2 additions & 2 deletions lib/trie/hash.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var hasherPool = sync.Pool{
}

// NewHasher create new Hasher instance
func NewHasher(parallel bool) *hasher {
func newHasher(parallel bool) *hasher {
h := hasherPool.Get().(*hasher)
h.parallel = parallel
return h
Expand Down Expand Up @@ -102,7 +102,7 @@ func (h *hasher) encode(n node) ([]byte, error) {
}

func encodeAndHash(n node) ([]byte, error) {
h := NewHasher(false)
h := newHasher(false)
defer h.returnToPool()

encChild, err := h.Hash(n)
Expand Down
8 changes: 4 additions & 4 deletions lib/trie/hash_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func generateRand(size int) [][]byte {
}

func TestNewHasher(t *testing.T) {
hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()

_, err := hasher.hash.Write([]byte("noot"))
Expand All @@ -58,7 +58,7 @@ func TestNewHasher(t *testing.T) {
}

func TestHashLeaf(t *testing.T) {
hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()

n := &leaf{key: generateRandBytes(380), value: generateRandBytes(64)}
Expand All @@ -71,7 +71,7 @@ func TestHashLeaf(t *testing.T) {
}

func TestHashBranch(t *testing.T) {
hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()

n := &branch{key: generateRandBytes(380), value: generateRandBytes(380)}
Expand All @@ -85,7 +85,7 @@ func TestHashBranch(t *testing.T) {
}

func TestHashShort(t *testing.T) {
hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()

n := &leaf{key: generateRandBytes(2), value: generateRandBytes(3)}
Expand Down
4 changes: 2 additions & 2 deletions lib/trie/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ func (b *branch) encodeAndHash() ([]byte, []byte, error) {
return b.encoding, b.hash, nil
}

hasher := NewHasher(false)
hasher := newHasher(false)
enc, err := hasher.encodeBranch(b)
if err != nil {
return nil, nil, err
Expand All @@ -255,7 +255,7 @@ func (l *leaf) encodeAndHash() ([]byte, []byte, error) {
if !l.isDirty() && l.encoding != nil && l.hash != nil {
return l.encoding, l.hash, nil
}
hasher := NewHasher(false)
hasher := newHasher(false)
enc, err := hasher.encodeLeaf(l)

if err != nil {
Expand Down
14 changes: 7 additions & 7 deletions lib/trie/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ func TestBranchEncode(t *testing.T) {

for _, child := range b.children {
if child != nil {
hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
encChild, er := hasher.Hash(child)
if er != nil {
Expand All @@ -181,7 +181,7 @@ func TestBranchEncode(t *testing.T) {
}
}

hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
res, err := hasher.encodeBranch(b)
if !bytes.Equal(res, expected) {
Expand Down Expand Up @@ -216,7 +216,7 @@ func TestLeafEncode(t *testing.T) {

expected = append(expected, buf.Bytes()...)

hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
res, err := hasher.encodeLeaf(l)
if !bytes.Equal(res, expected) {
Expand All @@ -240,7 +240,7 @@ func TestEncodeRoot(t *testing.T) {
t.Errorf("Fail to get key %x with value %x: got %x", test.key, test.value, val)
}

hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
_, err := hasher.encode(trie.root)
if err != nil {
Expand All @@ -267,7 +267,7 @@ func TestBranchDecode(t *testing.T) {
{key: byteArray(573), children: [16]node{}, value: []byte{0x01}},
}

hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
for _, test := range tests {
enc, err := hasher.encodeBranch(test)
Expand Down Expand Up @@ -298,7 +298,7 @@ func TestLeafDecode(t *testing.T) {
{key: byteArray(573), value: []byte{0x01}, dirty: true},
}

hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
for _, test := range tests {
enc, err := hasher.encodeLeaf(test)
Expand Down Expand Up @@ -337,7 +337,7 @@ func TestDecode(t *testing.T) {
&leaf{key: byteArray(573), value: []byte{0x01}},
}

hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
for _, test := range tests {
enc, err := hasher.encode(test)
Expand Down
4 changes: 2 additions & 2 deletions lib/trie/print.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func (t *Trie) String() string {
func (t *Trie) string(tree gotree.Tree, curr node, idx int) {
switch c := curr.(type) {
case *branch:
hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
c.encoding, _ = hasher.encode(c)
var bstr string
Expand All @@ -54,7 +54,7 @@ func (t *Trie) string(tree gotree.Tree, curr node, idx int) {
}
}
case *leaf:
hasher := NewHasher(false)
hasher := newHasher(false)
defer hasher.returnToPool()
c.encoding, _ = hasher.encode(c)
var bstr string
Expand Down

0 comments on commit 3c60752

Please sign in to comment.