Merge branch 'develop' into feature/improve_TransactionStoreTest

Author: xiechang33

.gitignore

@@ -49,5 +49,5 @@ src/main/resources/META-INF/
 
 /output_manager/
 /output_witness/
-
+output*
 nodeId.properties

build.gradle

@@ -89,7 +89,7 @@ dependencies {
 
     compile group: 'com.beust', name: 'jcommander', version: '1.72'
 
-    compile group: 'junit', name: 'junit', version: '4.8.1'
+    compile group: 'junit', name: 'junit', version: '4.12'
 
     compile group: 'net.jcip', name: 'jcip-annotations', version: '1.0'
 

src/main/java/org/tron/common/overlay/server/ChannelManager.java

@@ -20,25 +20,28 @@
 import static org.tron.common.overlay.message.ReasonCode.DUPLICATE_PEER;
 import static org.tron.common.overlay.message.ReasonCode.TOO_MANY_PEERS;
 
-import java.io.IOException;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
-
-import io.netty.channel.ChannelHandlerContext;
-import io.netty.handler.timeout.ReadTimeoutException;
 import org.apache.commons.collections4.map.LRUMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.client.PeerClient;
-import org.tron.common.overlay.message.DisconnectMessage;
 import org.tron.common.overlay.message.ReasonCode;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.ByteArrayWrapper;
@@ -143,6 +146,13 @@ public void notifyDisconnect(Channel channel) {
     syncPool.onDisconnect(channel);
     activePeers.values().remove(channel);
     newPeers.remove(channel);
+    if (channel == null || channel.getChannelHandlerContext() == null
+        || channel.getChannelHandlerContext().channel() == null) {
+      return;
+    }
+    InetSocketAddress socketAddress = (InetSocketAddress) channel.getChannelHandlerContext()
+        .channel().remoteAddress();
+    recentlyDisconnected.put(socketAddress.getAddress(), new Date());
   }
 
   public boolean isRecentlyDisconnected(InetAddress peerAddr) {

src/main/java/org/tron/core/capsule/TransactionCapsule.java

@@ -360,6 +360,10 @@ public byte[] getData() {
     return this.transaction.toByteArray();
   }
 
+  public long getSerializedSize() {
+    return this.transaction.getSerializedSize();
+  }
+
   @Override
   public Transaction getInstance() {
     return this.transaction;

src/main/java/org/tron/core/db/AccountStore.java

@@ -68,10 +68,10 @@ public boolean has(byte[] key) {
 
   @Override
   public void put(byte[] key, AccountCapsule item) {
+    super.put(key, item);
     if (indexHelper != null) {
       indexHelper.update(item.getInstance());
     }
-    super.put(key, item);
   }
 
   /**

src/main/java/org/tron/core/db/AssetIssueStore.java

@@ -63,10 +63,10 @@ public boolean has(byte[] key) {
 
   @Override
   public void put(byte[] key, AssetIssueCapsule item) {
+    super.put(key, item);
     if (indexHelper != null) {
       indexHelper.update(item.getInstance());
     }
-    super.put(key, item);
   }
 
   /**

src/main/java/org/tron/core/db/BlockStore.java

@@ -54,10 +54,10 @@ public static void destroy() {
 
   @Override
   public void put(byte[] key, BlockCapsule item) {
+    super.put(key, item);
     if (indexHelper != null) {
       indexHelper.update(item.getInstance());
     }
-    super.put(key, item);
   }
 
   /**

src/main/java/org/tron/core/db/Manager.java

@@ -861,7 +861,7 @@ public synchronized BlockCapsule generateBlock(
     Iterator iterator = pendingTransactions.iterator();
     while (iterator.hasNext()) {
       TransactionCapsule trx = (TransactionCapsule) iterator.next();
-      currentTrxSize += RamUsageEstimator.sizeOf(trx);
+      currentTrxSize += trx.getSerializedSize();
       // judge block size
       if (currentTrxSize > ChainConstant.TRXS_SIZE) {
         postponedTrxCount++;

src/main/java/org/tron/core/db/TransactionStore.java

@@ -34,10 +34,10 @@ public boolean has(byte[] key) {
 
   @Override
   public void put(byte[] key, TransactionCapsule item) {
+    super.put(key, item);
     if (indexHelper != null) {
       indexHelper.update(item.getInstance());
     }
-    super.put(key, item);
   }
 
   /**

src/main/java/org/tron/core/db/WitnessStore.java

@@ -53,10 +53,10 @@ public static void destory() {
 
   @Override
   public void put(byte[] key, WitnessCapsule item) {
+    super.put(key, item);
     if (indexHelper != null) {
       indexHelper.update(item.getInstance());
     }
-    super.put(key, item);
   }
 
   /**