From 75b952d1c7a6dfdece0dc2fb3bd4f9e6548ffa8d Mon Sep 17 00:00:00 2001 From: Mike Hearn Date: Thu, 5 Mar 2015 14:06:56 -0800 Subject: [PATCH] Sha256Hash: use Guava to pack the hash code instead of hand written code. --- core/src/main/java/org/bitcoinj/core/Sha256Hash.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java b/core/src/main/java/org/bitcoinj/core/Sha256Hash.java index 5ad6ee69..593e98ab 100644 --- a/core/src/main/java/org/bitcoinj/core/Sha256Hash.java +++ b/core/src/main/java/org/bitcoinj/core/Sha256Hash.java @@ -18,6 +18,7 @@ package org.bitcoinj.core; import com.google.common.io.ByteStreams; +import com.google.common.primitives.*; import java.io.File; import java.io.FileInputStream; @@ -115,7 +116,7 @@ public class Sha256Hash implements Serializable, Comparable { @Override public int hashCode() { // Use the last 4 bytes, not the first 4 which are often zeros in Bitcoin. - return (bytes[31] & 0xFF) | ((bytes[30] & 0xFF) << 8) | ((bytes[29] & 0xFF) << 16) | ((bytes[28] & 0xFF) << 24); + return Ints.fromBytes(bytes[28], bytes[29], bytes[30], bytes[31]); } @Override