fix code

Author: conglinduye

src/main/java/org/tron/command/ConsensusCommand.java

@@ -37,8 +37,8 @@ public void getClient(Peer peer,String[] args) {
 
     }
     public void loadBlock(Peer peer){
-        System.out.println("BlockChain loadding  ...");
-        Client.loadBlock(peer);
+        //System.out.println("BlockChain loading  ...");
+        //Client.loadBlock(peer);
     }
 
     public void usage() {

src/main/java/org/tron/consensus/client/Client.java

@@ -9,6 +9,9 @@
 import org.tron.overlay.message.Message;
 import org.tron.overlay.message.Type;
 import org.tron.peer.Peer;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;
@@ -28,12 +31,12 @@ public class Client{
         client.serializer().register(PutCommand.class);
         client.serializer().register(GetQuery.class);
 
-        Collection<Address> cluster = Arrays.asList(
+        /*Collection<Address> cluster = Arrays.asList(
                 new Address("192.168.0.109", 5000)
         );
         CompletableFuture<CopycatClient> future = client.connect(cluster);
-        future.join();
-        /*InetAddress localhost = null;
+        future.join();*/
+        InetAddress localhost = null;
         try {
             localhost = InetAddress.getLocalHost();
             Collection<Address> cluster = Arrays.asList(
@@ -44,7 +47,7 @@ public class Client{
             future.join();
         } catch (UnknownHostException e) {
             e.printStackTrace();
-        }*/
+        }
     }
 
     public static CopycatClient getClient() {
@@ -61,10 +64,6 @@ public static void putMessage(String[] args) {
     public static void getMessage1(String key) {
         Object result = client.submit(new GetQuery(key)).join();
         System.out.println("Consensus " + key + " is: " + result);
-//        client.submit(new GetQuery(key)).thenAccept(result -> {
-//            System.out.println("Consensus " + key + " is: " + result);
-//        });
-
     }
 
     public static void putMessage1(Message message) {
@@ -121,15 +120,14 @@ public static void getMessage(Peer peer,String key)  {
                                 -> {
                             //System.out.println("Consensus " + key + " is: " + result);
                             //System.out.println("type: " + result.getClass().getSimpleName());
-                            peer.addReceiveTransaction(String
-                                    .valueOf(transaction));
+                            peer.addReceiveTransaction(String.valueOf(transaction));
                         });
                         preTime[0] = time.toString();
                     }else {
                         preTime[0] = preTime[0];
                     }
                     try {
-                        Thread.sleep(4000);
+                        Thread.sleep(3000);
                     }catch (Exception e){
                         e.printStackTrace();
                     }
@@ -158,22 +156,21 @@ public static void getMessage(Peer peer,String key)  {
                             e.printStackTrace();
                         }
                     }
+
                     i = i-1;
                     String finalBlock_key = "block" + i;
-
                     client.submit(new GetQuery(finalBlock_key)).thenAccept(block -> {
                         /*System.out.println("Consensus " + key + " is: " +
-                                block);*/
+                        block);*/
                         if (!String.valueOf(block).equals(preMessage[0])) {
-                            peer.addReceiveBlock(String.valueOf
-                                    (block));
+                            peer.addReceiveBlock(String.valueOf(block));
                             preMessage[0] = String.valueOf(block);
                         }else {
                             preMessage[0] = preMessage[0];
                         }
                     });
                     try {
-                        Thread.sleep(4000);
+                        Thread.sleep(3000);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }

src/main/java/org/tron/consensus/server/Server.java

@@ -45,16 +45,8 @@ public static void serverRun() {
             //server.join(cluster).join();
 
             System.out.println("Server xxd: " + server.cluster().members());
-
             CopycatServer.State state = server.state();
             System.out.println("Server state: " + state);
-            server.onStateChange(state1 -> {
-                if (state == CopycatServer.State.LEADER) {
-                    System.out.println("Server state: " + state);
-                }
-            });
-            //server.context();
-
         } catch (UnknownHostException e) {
             e.printStackTrace();
         }

src/main/java/org/tron/core/Blockchain.java

@@ -88,7 +88,7 @@ public Blockchain(String address, String type) {
                 .getHash()
                 .toByteArray();
         blockDB.put(LAST_HASH, lastHash);
-        // put message to consensus 2018/1/2
+        // put message to consensus
         if (type.equals(Peer.PEER_SERVER)) {
             String value = ByteArray.toHexString(genesisBlock.toByteArray());
             Message message = new Message(value, Type.BLOCK);
@@ -170,7 +170,6 @@ public HashMap<String, TXOutputs> findUTXO() {
                         }
                     }
 
-
                     TXOutputs outs = utxo.get(txid);
 
                     if (outs == null) {

src/main/java/org/tron/peer/Peer.java

@@ -81,26 +81,19 @@ private void init() {
 
     private void initLoadBlock(){
         if (this.type.equals(Peer.PEER_NORMAL)){
+            System.out.println("BlockChain loading  ...");
             Client.loadBlock(this);
         }
     }
+
     private void initBlockchian() {
         new ConsensusCommand().server();
         if (Blockchain.dbExists()) {
             blockchain = new Blockchain();
         } else {
             //blockchain = new Blockchain(ByteArray.toHexString(wallet.getAddress()));
-            if (this.type.equals(Peer.PEER_SERVER)){
-                System.out.println("peer-server");
-                blockchain = new Blockchain(ByteArray.toHexString(wallet
-                        .getAddress()), this.type);
-            }
-            if (this.type.equals(Peer.PEER_NORMAL)){
-                System.out.println("BlockChain loadding  ...");
-                blockchain = new Blockchain(ByteArray.toHexString(wallet
-                        .getAddress()), this.type);
-
-            }
+            blockchain = new Blockchain(ByteArray.toHexString(wallet
+                    .getAddress()), this.type);
         }
     }
 

src/test/resources/seednode.json

@@ -0,0 +1,17 @@
+{
+  "type": "FeatureCollection",
+  "features": [{
+    "type": "Feature",
+    "properties": {
+      "name": "Tron",
+      "ID_0": 102,
+      "ID_1": 18,
+      "ISO": "HKG"
+    },
+    "geometry": {
+      "type": "Polygon",
+      "coordinates": [[[114.084511, 22.519991], [114.075668, 22.517466], [114.078194, 22.516203], [114.079460, 22.516623], [114.082825, 22.519150], [114.084511, 22.519991]]]
+    },
+    "nodeIP":"192.168.0.100"
+  }]
+}