fix loadblock

Author: conglinduye

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

@@ -33,7 +33,7 @@ public class Client{
         client.serializer().register(GetQuery.class);
 
         Collection<Address> cluster = Arrays.asList(
-                new Address("192.168.0.100", 5000)
+                new Address("192.168.0.107", 5000)
         );
         CompletableFuture<CopycatClient> future = client.connect(cluster);
         future.join();
@@ -104,7 +104,6 @@ public static void putMessage1(Message message) {
                         client.submit(new PutCommand(block_key, message.getMessage()));
                         System.out.println("Block: consensus success");
                         f = false;
-                        break;
                     }
                 } catch (NullPointerException e) {
                     e.printStackTrace();
@@ -189,27 +188,19 @@ public static void getMessage(Peer peer,String key)  {
     }
     public static void loadBlock(Peer peer){
         int i = 2;
-        boolean f = true;
-        while(f){
+        boolean a = true;
+        while(a){
             String block_key = "block" + i;
             Object block = client.submit(new GetQuery(block_key)).join();
-            System.out.println(block.toString());
-            try {
-                if (!(block == null)) {
-                    /*System.out.println("Consensus " + block_key + " is: " +
-                                block);*/
-                    peer.addReceiveBlock(String.valueOf
-                            (block));
-                    f =true;
-                    i = i+1;
-                }else {
-                    f = false;
-                    break;
-                }
-            } catch (NullPointerException e) {
-                e.printStackTrace();
-                System.out.println("object == null");
-                break;
+            if (!(block == null)) {
+                peer.addReceiveBlock(String.valueOf
+                        (block));
+                System.out.println(block.toString());
+                a = true;
+                i ++;
+            }
+            if (null == block){
+                a = false;
             }
         }
     }

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

@@ -304,7 +304,7 @@ public void addBlock(List<Transaction> transactions) {
 
     }
 
-    public void receiveBlock(Block block, UTXOSet utxoSet) {
+    public void receiveBlock(Block block, UTXOSet utxoSet, Peer peer) {
 
         byte[] lastHashKey = LAST_HASH;
         byte[] lastHash = blockDB.get(lastHashKey);
@@ -323,7 +323,7 @@ public void receiveBlock(Block block, UTXOSet utxoSet) {
                 .toByteArray();
 
         // update lastHash
-        Tron.getPeer().getBlockchain().getBlockDB().put(lastHashKey, ch);
+        peer.getBlockchain().getBlockDB().put(lastHashKey, ch);
 
         this.lastHash = ch;
         currentHash = ch;

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

@@ -59,7 +59,7 @@ public void addReceiveBlock(String message) {
         try {
             block = TronBlock.Block.parseFrom(ByteArray.fromHexString(message
                     ));
-            blockchain.receiveBlock(block, utxoSet);
+            blockchain.receiveBlock(block, utxoSet, this);
         } catch (InvalidProtocolBufferException e) {
             e.printStackTrace();
         }
@@ -76,23 +76,30 @@ private void init() {
         initWallet();
         initBlockchian();
         initUTXOSet();
+        initLoadBlock();
     }
 
+    private void initLoadBlock(){
+        if (this.type.equals(Peer.PEER_NORMAL)){
+            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  ...");
+                System.out.println("BlockChain loadding  ...");
                 blockchain = new Blockchain(ByteArray.toHexString(wallet
                         .getAddress()), this.type);
-                Client.loadBlock(this);
+
             }
         }
     }