Skip to content

Commit

Permalink
minor refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
esaulpaugh committed Mar 6, 2021
1 parent 9812716 commit 8f7139f
Showing 1 changed file with 10 additions and 12 deletions.
22 changes: 10 additions & 12 deletions src/main/java/com/esaulpaugh/headlong/util/SuperSerial.java
Original file line number Diff line number Diff line change
Expand Up @@ -212,32 +212,30 @@ private static BigInteger asSigned(int typeBits, RLPItem item) {
return BigInteger.ZERO;
}

private static Object serializeArray(ArrayType<? extends ABIType<?>, ?> arrayType, Object arr) {
final ABIType<?> elementType = arrayType.getElementType();
switch (elementType.typeCode()) {
private static Object serializeArray(ArrayType<? extends ABIType<?>, ?> type, Object arr) {
switch (type.getElementType().typeCode()) {
case TYPE_CODE_BOOLEAN: return serializeBooleanArray((boolean[]) arr);
case TYPE_CODE_BYTE: return serializeByteArray(arr, arrayType.isString());
case TYPE_CODE_BYTE: return serializeByteArray(arr, type.isString());
case TYPE_CODE_INT: return serializeIntArray((int[]) arr);
case TYPE_CODE_LONG: return serializeLongArray((long[]) arr);
case TYPE_CODE_BIG_INTEGER:
case TYPE_CODE_BIG_DECIMAL:
case TYPE_CODE_ARRAY:
case TYPE_CODE_TUPLE: return serializeObjectArray(arr, elementType);
case TYPE_CODE_TUPLE: return serializeObjectArray(arr, type.getElementType());
default: throw new Error();
}
}

private static Object deserializeArray(ArrayType<? extends ABIType<?>,?> arrayType, RLPItem item) {
final ABIType<?> elementType = arrayType.getElementType();
switch (elementType.typeCode()) {
private static Object deserializeArray(ArrayType<? extends ABIType<?>,?> type, RLPItem item) {
switch (type.getElementType().typeCode()) {
case TYPE_CODE_BOOLEAN: return deserializeBooleanArray((RLPList) item);
case TYPE_CODE_BYTE: return deserializeByteArray(item, arrayType.isString());
case TYPE_CODE_INT: return deserializeIntArray((RLPList) item, (IntType) arrayType.getElementType());
case TYPE_CODE_LONG: return deserializeLongArray((RLPList) item, (LongType) arrayType.getElementType());
case TYPE_CODE_BYTE: return deserializeByteArray(item, type.isString());
case TYPE_CODE_INT: return deserializeIntArray((RLPList) item, (IntType) type.getElementType());
case TYPE_CODE_LONG: return deserializeLongArray((RLPList) item, (LongType) type.getElementType());
case TYPE_CODE_BIG_INTEGER:
case TYPE_CODE_BIG_DECIMAL:
case TYPE_CODE_ARRAY:
case TYPE_CODE_TUPLE: return deserializeObjectArray(elementType, (RLPList) item);
case TYPE_CODE_TUPLE: return deserializeObjectArray(type.getElementType(), (RLPList) item);
default: throw new Error();
}
}
Expand Down

0 comments on commit 8f7139f

Please sign in to comment.