status-im
/
ethereumj-personal
mirror of https://github.com/status-im/ethereumj-personal.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove unused utility methods

This commit is contained in:
nicksavers 2014-05-24 15:17:47 +02:00
parent e5fd2a3efc
commit 86618f9eb8
2 changed files with 5 additions and 98 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
ethereumj-core/src/main/java/org/ethereum/util/ByteUtil.java
View File

@ -3,17 +3,10 @@ package org.ethereum.util;
import java.math.BigInteger;
import java.util.Arrays;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spongycastle.util.encoders.Hex;
import com.google.common.primitives.UnsignedInteger;
import com.google.common.primitives.UnsignedLongs;
public class ByteUtil {
private static Logger logger = LoggerFactory.getLogger("ByteUtil");
/**
* Creates a copy of bytes and appends b to the end of it
*/
@ -43,57 +36,11 @@ public class ByteUtil {
return bytes;
}
public static byte[] hexStringToByteArr(String hexString){
String hexSymbols = "0123456789ABCDEF";
int arrSize = (int) (hexString.length() / 3);
byte[] result = new byte[arrSize];
for (int i = 0; i < arrSize; ++i){
int digit1 = hexSymbols.indexOf( hexString.charAt(i * 3) );
int digit2 = hexSymbols.indexOf( hexString.charAt(i * 3 + 1) );
result[i] = (byte) (digit1 * 16 + digit2);
}
return result;
}
public static String toHexString(byte[] data){
if (data == null) return "null";
else return Hex.toHexString(data);
}
public static void printHexStringForByte(byte data){
System.out.print("[");
String hexNum = Integer.toHexString ((int) data & 0xFF);
if (((int) data & 0xFF) < 16) {
hexNum = "0" + hexNum;
}
System.out.print( hexNum );
System.out.print("]");
System.out.println();
}
public static void printHexStringForByteArray(byte[] data){
if (logger.isInfoEnabled()) {
logger.info("[");
for (int i = 0; i < data.length; ++i) {
String hexNum = Integer.toHexString((int) data[i] & 0xFF);
if (((int) data[i] & 0xFF) < 16) {
hexNum = "0" + hexNum;
}
logger.info(hexNum);
logger.info(" ");
}
logger.info("]");
logger.info("");
}
}
// The packet size should be 4 byte long
public static byte[] calcPacketSize(byte[] packet){
@ -135,38 +82,4 @@ public class ByteUtil {
return 0;
return new BigInteger(1, b).intValue();
}
public static byte[] encodeInt(int value) {
if (isLessThanUnsigned(value, 253)) {
return new byte[]{(byte) value};
} else if (isLessThanUnsigned(value, 65536)) {
return new byte[]{(byte) 253, (byte) (value), (byte) (value >> 8)};
} else if (isLessThanUnsigned(value, UnsignedInteger.MAX_VALUE.longValue())) {
byte[] bytes = new byte[5];
bytes[0] = (byte) 254;
uint32ToByteArrayLE(value, bytes, 1);
return bytes;
} else {
byte[] bytes = new byte[9];
bytes[0] = (byte) 255;
uint32ToByteArrayLE(value, bytes, 1);
uint32ToByteArrayLE(value >>> 32, bytes, 5);
return bytes;
}
}
/**
* Work around lack of unsigned types in Java.
*/
public static boolean isLessThanUnsigned(long n1, long n2) {
return UnsignedLongs.compare(n1, n2) < 0;
}
public static void uint32ToByteArrayLE(long val, byte[] out, int offset) {
out[offset + 0] = (byte) (0xFF & (val >> 0));
out[offset + 1] = (byte) (0xFF & (val >> 8));
out[offset + 2] = (byte) (0xFF & (val >> 16));
out[offset + 3] = (byte) (0xFF & (val >> 24));
}
}

16
ethereumj-core/src/test/java/org/ethereum/util/RLPTest.java
View File

@ -33,7 +33,7 @@ public class RLPTest {
"E0 DE 49 98 33 4F 3B CF 73 FA 11 7E F2 13 F8 74 " +
"17 08 9F EA F8 4C 21 B0";
byte[] payload = ByteUtil.hexStringToByteArr(peersPacket);
byte[] payload = Hex.decode(peersPacket);
byte[] ip = RLP.decodeIP4Bytes(payload, 5);
@ -50,7 +50,7 @@ public class RLPTest {
"E0 DE 49 98 33 4F 3B CF 73 FA 11 7E F2 13 F8 74 " +
"17 08 9F EA F8 4C 21 B0";
byte[] payload = ByteUtil.hexStringToByteArr(peersPacket);
byte[] payload = Hex.decode(peersPacket);
int oneInt = RLP.decodeInt(payload, 11);
assertEquals(oneInt, 30303);
@ -71,7 +71,7 @@ public class RLPTest {
"98 33 4F 3B CF 73 FA 11 7E F2 13 F8 74 17 08 9F " +
"EA F8 4C 21 B0 ";
byte[] payload = ByteUtil.hexStringToByteArr(peersPacket);
byte[] payload = Hex.decode(peersPacket);
int nextIndex = 5;
byte[] ip = RLP.decodeIP4Bytes(payload, nextIndex);
@ -217,12 +217,11 @@ public class RLPTest {
"40 7F 65 9C 78 F4 19 02 5D 78 57 27 ED 01 7B 6A " +
"DD 21 95 2D 7E 12 00 73 73 E3 21 DB C3 18 24 BA ";
byte[] byteArray = ByteUtil.hexStringToByteArr(byteArr);
byte[] byteArray = Hex.decode(byteArr);
String expected = "B8 40 " + byteArr;
assertArrayEquals(ByteUtil.hexStringToByteArr(expected),
RLP.encodeElement(byteArray));
assertEquals(expected, Hex.toHexString(RLP.encodeElement(byteArray)));
}
@Test /** encode list */
@ -717,9 +716,4 @@ public class RLPTest {
oos.close();
return baos.size();
}
}