simplify and call out the code of the keccak hash function

Signed-off-by: Antoine Toulme <[email protected]>
hyperledger · Feb 12, 2021 · 44aba8e · 44aba8e
1 parent d617364
commit 44aba8e
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/KeccakHasher.java b/ethereum/core/src/main/java/org/hyperledger/besu/ethereum/mainnet/KeccakHasher.java
@@ -38,14 +38,13 @@ public PoWSolution hash(
       final long number,
       final EpochCalculator epochCalc,
       final byte[] prePowHash) {
-    Bytes input = Bytes.wrap(Bytes.wrap(prePowHash), Bytes.ofUnsignedLong(nonce));
 
     MessageDigest digest = KECCAK_256.get();
-    digest.update(input.toArrayUnsafe());
-    byte[] result = digest.digest();
-    Bytes32 resultBytes = Bytes32.wrap(result);
+    digest.update(prePowHash);
+    digest.update(Bytes.ofUnsignedLong(nonce).toArrayUnsafe());
+    Bytes32 solution = Bytes32.wrap(digest.digest());
+    Hash mixHash = Hash.wrap(solution);
 
-    PoWSolution solution = new PoWSolution(nonce, Hash.wrap(resultBytes), resultBytes, prePowHash);
-    return solution;
+    return new PoWSolution(nonce, mixHash, solution, prePowHash);
   }
 }