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

Merge branch 'master' into cleanup

This commit is contained in:
nicksavers 2014-05-04 21:25:14 +02:00
parent d7091341a4 62c39f783e
commit 1f55856067
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README
View File

@ -1 +1,2 @@
-- First small steps in the big journey
test

11
ethereumj-core/src/main/java/org/ethereum/net/message/PeersMessage.java
View File

@ -44,16 +44,7 @@ public class PeersMessage extends Message {
RLPList peerParams = (RLPList)paramsList.getElement(i);
RLPItem ip_a = (RLPItem)((RLPList) peerParams.getElement(0)).getElement(0);
RLPItem ip_b = (RLPItem)((RLPList) peerParams.getElement(0)).getElement(1);
RLPItem ip_c = (RLPItem)((RLPList) peerParams.getElement(0)).getElement(2);
RLPItem ip_d = (RLPItem)((RLPList) peerParams.getElement(0)).getElement(3);
byte ipA = ip_a.getData() == null ? 0 : ip_a.getData()[0];
byte ipB = ip_b.getData() == null ? 0 : ip_b.getData()[0];
byte ipC = ip_c.getData() == null ? 0 : ip_c.getData()[0];
byte ipD = ip_d.getData() == null ? 0 : ip_d.getData()[0];
byte[] ip = new byte[]{ipA, ipB, ipC, ipD};
byte[] ip = ((RLPItem) peerParams.getElement(0)).getData();
byte[] shortData = ((RLPItem) peerParams.getElement(1)).getData();

2
ethereumj-core/src/test/java/org/ethereum/block/BlockTest.java
View File

@ -17,7 +17,7 @@ import java.math.BigInteger;
*/
public class BlockTest {
@Test /* Creating genesis hash */
@Test /* Creating genesis hash not ready yet */
public void test1() throws IOException {
/*