Remove leaf hashing in MerkleRoot function

See ethereum/consensus-specs#646 for clarification.
wemeetagain · Feb 19, 2019 · fcf3168 · fcf3168
1 parent c30bef0
commit fcf3168
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/shared/hashutil/merkleRoot.go b/shared/hashutil/merkleRoot.go
@@ -12,12 +12,6 @@ package hashutil
 func MerkleRoot(values [][]byte) []byte {
 	length := len(values)
 
-	// Data is hashed so as to be stored as leaves in the tree.
-	for i, v := range values {
-		hashedValue := Hash(v)
-		values[i] = hashedValue[:]
-	}
-
 	newSet := make([][]byte, length, length*2)
 	newSet = append(newSet, values...)
 

diff --git a/shared/hashutil/merkleRoot_test.go b/shared/hashutil/merkleRoot_test.go
@@ -13,10 +13,10 @@ func TestMerkleRoot(t *testing.T) {
 		{'d'},
 	}
 
-	hashedV1 := Hash([]byte{'a'})
-	hashedV2 := Hash([]byte{'b'})
-	hashedV3 := Hash([]byte{'c'})
-	hashedV4 := Hash([]byte{'d'})
+	hashedV1 := []byte{'a'}
+	hashedV2 := []byte{'b'}
+	hashedV3 := []byte{'c'}
+	hashedV4 := []byte{'d'}
 
 	leftNode := Hash(append(hashedV1[:], hashedV2[:]...))
 	rightNode := Hash(append(hashedV3[:], hashedV4[:]...))