Polish changes made in pull request #189

- Organize imports using shared IDEA configuration

 - Format sources, including:
   - Normalize 4-space indentation
   - Wrap at 120 char right margin
   - Remove spaces around method arguments

ethereumj-core/src/test/java/test/ethereum/net/DisconnectMessageTest.java

@@ -1,11 +1,5 @@
 package test.ethereum.net;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertFalse;
-
-import java.lang.System;
-
 import org.ethereum.net.message.ReasonCode;
 import org.ethereum.net.p2p.DisconnectMessage;
 
@@ -13,7 +7,7 @@ import org.junit.Test;
 
 import org.spongycastle.util.encoders.Hex;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 public class DisconnectMessageTest {
 

ethereumj-core/src/test/java/test/ethereum/net/GetPeersMessageTest.java

@@ -1,11 +1,13 @@
 package test.ethereum.net;
 
-import static org.junit.Assert.assertEquals;
+import org.ethereum.net.p2p.GetPeersMessage;
+import org.ethereum.net.p2p.P2pMessageCodes;
+
+import org.junit.Test;
 
 import org.spongycastle.util.encoders.Hex;
-import org.ethereum.net.p2p.P2pMessageCodes;
+
-import org.ethereum.net.p2p.GetPeersMessage;
+import static org.junit.Assert.assertEquals;
-import org.junit.Test;
 
 public class GetPeersMessageTest {
 
@@ -17,8 +19,6 @@ public class GetPeersMessageTest {
         //Init
         GetPeersMessage getPeersMessage = new GetPeersMessage();
 
-        //System.out.println(getPeersMessage.getEncoded());
-
         //toString
         assertEquals("[GET_PEERS]", getPeersMessage.toString());
 
@@ -30,7 +30,6 @@ public class GetPeersMessageTest {
 
         //getCommand
         assertEquals(P2pMessageCodes.GET_PEERS, getPeersMessage.getCommand());
-        
     }
 }
 

ethereumj-core/src/test/java/test/ethereum/net/HelloMessageTest.java

@@ -1,17 +1,12 @@
 package test.ethereum.net;
 
-import static org.junit.Assert.assertEquals;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
-
 import org.ethereum.net.client.Capability;
 import org.ethereum.net.eth.EthHandler;
 import org.ethereum.net.p2p.HelloMessage;
-import org.ethereum.net.p2p.P2pMessageCodes;
 import org.ethereum.net.p2p.P2pHandler;
+import org.ethereum.net.p2p.P2pMessageCodes;
 import org.ethereum.net.shh.ShhHandler;
+
 import org.junit.Test;
 
 import org.slf4j.Logger;
@@ -19,6 +14,9 @@ import org.slf4j.LoggerFactory;
 
 import org.spongycastle.util.encoders.Hex;
 
+import java.util.Arrays;
+import java.util.List;
+
 import static org.junit.Assert.assertEquals;
 
 public class HelloMessageTest {
@@ -43,8 +41,6 @@ public class HelloMessageTest {
         assertEquals(
                 "1fbf1e41f08078918c9f7b6734594ee56d7f538614f602c71194db0a1af5a77f9b86eb14669fe7a8a46a2dd1b7d070b94e463f4ecd5b337c8b4d31bbf8dd5646",
                 helloMessage.getPeerId());
-
-
     }
 
     //Instantiate from constructor
@@ -88,7 +84,6 @@ public class HelloMessageTest {
         String peerId = ""; //null id
 
         HelloMessage helloMessage = new HelloMessage(version, clientStr, capabilities, listenPort, peerId);
-        //logger.info(helloMessage.toString());
 
         assertEquals(P2pMessageCodes.HELLO, helloMessage.getCommand());
         assertEquals(version, helloMessage.getP2PVersion());

ethereumj-core/src/test/java/test/ethereum/net/PeerTest.java

@@ -1,16 +1,19 @@
 package test.ethereum.net;
 
-import static org.junit.Assert.assertEquals;
-
 import org.ethereum.net.client.Capability;
 import org.ethereum.net.p2p.Peer;
 
-import org.spongycastle.util.encoders.Hex;
-import java.net.InetAddress;
-import java.util.List;
-import java.util.ArrayList;
 import org.junit.Test;
 
+import org.spongycastle.util.encoders.Hex;
+
+import java.net.InetAddress;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
 public class PeerTest {
 
     /* PEER */

ethereumj-core/src/test/java/test/ethereum/net/PeersMessageTest.java

@@ -1,17 +1,5 @@
 package test.ethereum.net;
 
-import static org.junit.Assert.assertEquals;
-
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 import org.ethereum.net.client.Capability;
 import org.ethereum.net.p2p.GetPeersMessage;
 import org.ethereum.net.p2p.P2pMessageCodes;
@@ -25,7 +13,14 @@ import org.slf4j.LoggerFactory;
 
 import org.spongycastle.util.encoders.Hex;
 
+import java.net.InetAddress;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
 
@@ -66,7 +61,6 @@ public class PeersMessageTest {
                 peer.getPeerId());
     }
 
-
     @Test /* PeersMessage 1 from constructor */
     public void testPeers_2() {
         //Init

ethereumj-core/src/test/java/test/ethereum/net/StatusMessageTest.java

@@ -2,8 +2,6 @@ package test.ethereum.net;
 
 import org.ethereum.net.eth.StatusMessage;
 
-import java.math.BigInteger;
-
 import org.junit.Test;
 
 import org.slf4j.Logger;
@@ -11,6 +9,8 @@ import org.slf4j.LoggerFactory;
 
 import org.spongycastle.util.encoders.Hex;
 
+import java.math.BigInteger;
+
 import static org.junit.Assert.assertEquals;
 
 public class StatusMessageTest {
@@ -40,16 +40,17 @@ public class StatusMessageTest {
         byte version = 39;
         byte netId = 0;
         byte[] difficulty = new BigInteger("25c60144", 16).toByteArray();
-        byte[] bestHash = new BigInteger("832056d3c93ff2739ace7199952e5365aa29f18805be05634c4db125c5340216",16).toByteArray();
+        byte[] bestHash =
-        byte[] genesisHash = new BigInteger("955f36d073ccb026b78ab3424c15cf966a7563aa270413859f78702b9e8e22cb",16).toByteArray();
+                new BigInteger("832056d3c93ff2739ace7199952e5365aa29f18805be05634c4db125c5340216", 16).toByteArray();
+        byte[] genesisHash =
+                new BigInteger("955f36d073ccb026b78ab3424c15cf966a7563aa270413859f78702b9e8e22cb", 16).toByteArray();
 
         StatusMessage statusMessage = new StatusMessage(version, netId, difficulty, bestHash, genesisHash);
 
         logger.info(statusMessage.toString());
 
         assertEquals(39, statusMessage.getProtocolVersion());
-        assertEquals("25c60144",
+        assertEquals("25c60144", Hex.toHexString(statusMessage.getTotalDifficulty()));
-                Hex.toHexString(statusMessage.getTotalDifficulty()));
         assertEquals("00832056d3c93ff2739ace7199952e5365aa29f18805be05634c4db125c5340216",
                 Hex.toHexString(statusMessage.getBestHash()));
         assertEquals("00955f36d073ccb026b78ab3424c15cf966a7563aa270413859f78702b9e8e22cb",
@@ -70,12 +71,9 @@ public class StatusMessageTest {
         logger.info(statusMessage.toString());
 
         assertEquals(-1, statusMessage.getProtocolVersion());
-        assertEquals("ff000000",
+        assertEquals("ff000000", Hex.toHexString(statusMessage.getTotalDifficulty()));
-                Hex.toHexString(statusMessage.getTotalDifficulty()));
+        assertEquals("ff00000000000000000000000000", Hex.toHexString(statusMessage.getBestHash()));
-        assertEquals("ff00000000000000000000000000",
+        assertEquals("ff000000000000000000000000000000", Hex.toHexString(statusMessage.getGenesisHash()));
-                Hex.toHexString(statusMessage.getBestHash()));
-        assertEquals("ff000000000000000000000000000000",
-                Hex.toHexString(statusMessage.getGenesisHash()));
     }
 }