From 7c56702e7825c927267fef60b80410f3760615d2 Mon Sep 17 00:00:00 2001 From: Evan Saulpaugh Date: Sat, 12 Oct 2019 23:40:18 -0500 Subject: [PATCH] eliminate some warnings --- .../java/com/esaulpaugh/headlong/abi/PackedDecoder.java | 6 +++--- src/main/java/com/esaulpaugh/headlong/rlp/RLPItem.java | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/esaulpaugh/headlong/abi/PackedDecoder.java b/src/main/java/com/esaulpaugh/headlong/abi/PackedDecoder.java index 853a25d0e..b971448a2 100644 --- a/src/main/java/com/esaulpaugh/headlong/abi/PackedDecoder.java +++ b/src/main/java/com/esaulpaugh/headlong/abi/PackedDecoder.java @@ -71,7 +71,7 @@ private static Tuple decodeTopTuple(TupleType tupleType, byte[] buffer, int end) case TYPE_CODE_BIG_INTEGER: idx -= type.byteLengthPacked(null); end = idx; decodeBigInteger((BigIntegerType) type, buffer, idx, elements, i); break; case TYPE_CODE_BIG_DECIMAL: idx -= type.byteLengthPacked(null); end = idx; decodeBigDecimal((BigDecimalType) type, buffer, idx, elements, i); break; case TYPE_CODE_ARRAY: { - final ArrayType, ?> arrayType = (ArrayType, ?>) type; + final ArrayType, ?> arrayType = (ArrayType) type; end = idx = idx - (arrayType.elementType.byteLengthPacked(null) * arrayType.length); idx -= decodeArrayDynamic(arrayType, buffer, idx, end, elements, i); break; @@ -92,7 +92,7 @@ private static Tuple decodeTopTuple(TupleType tupleType, byte[] buffer, int end) case TYPE_CODE_LONG: idx += decodeLong((LongType) type, buffer, idx, elements, i); break; case TYPE_CODE_BIG_INTEGER: idx += decodeBigInteger((BigIntegerType) type, buffer, idx, elements, i); break; case TYPE_CODE_BIG_DECIMAL: idx += decodeBigDecimal((BigDecimalType) type, buffer, idx, elements, i); break; - case TYPE_CODE_ARRAY: idx += decodeArrayDynamic((ArrayType, ?>) type, buffer, idx, end, elements, i); break; + case TYPE_CODE_ARRAY: idx += decodeArrayDynamic((ArrayType) type, buffer, idx, end, elements, i); break; case TYPE_CODE_TUPLE: throw new UnsupportedOperationException("nested tuple"); // idx += decodeTupleDynamic((TupleType) type, buffer, idx, end, elements, i); break; } } @@ -118,7 +118,7 @@ private static Tuple decodeTupleStatic(TupleType tupleType, byte[] buffer) { case TYPE_CODE_LONG: idx += decodeLong((LongType) type, buffer, idx, elements, i); break; case TYPE_CODE_BIG_INTEGER: idx += decodeBigInteger((BigIntegerType) type, buffer, idx, elements, i); break; case TYPE_CODE_BIG_DECIMAL: idx += decodeBigDecimal((BigDecimalType) type, buffer, idx, elements, i); break; - case TYPE_CODE_ARRAY: idx += decodeArrayDynamic((ArrayType, ?>) type, buffer, idx, end, elements, i); break; + case TYPE_CODE_ARRAY: idx += decodeArrayDynamic((ArrayType) type, buffer, idx, end, elements, i); break; case TYPE_CODE_TUPLE: throw new UnsupportedOperationException("nested tuple"); // idx += decodeTupleDynamic((TupleType) type, buffer, idx, end, elements, i); break; } } diff --git a/src/main/java/com/esaulpaugh/headlong/rlp/RLPItem.java b/src/main/java/com/esaulpaugh/headlong/rlp/RLPItem.java index f56e1a609..d60548e46 100644 --- a/src/main/java/com/esaulpaugh/headlong/rlp/RLPItem.java +++ b/src/main/java/com/esaulpaugh/headlong/rlp/RLPItem.java @@ -232,10 +232,8 @@ public BigDecimal asBigDecimal(int scale) { @Override public final int hashCode() { int result = 1; - final byte[] buf = buffer; - final int end = endIndex; - for (int i = index; i < end; i++) { - result = 31 * result + buf[i]; + for (int i = index; i < endIndex; i++) { + result = 31 * result + buffer[i]; } return result; }