Merge remote-tracking branch 'origin/develop' into develop

Author: zhaohong

src/main/java/org/tron/common/overlay/client/PeerClient.java

@@ -18,10 +18,10 @@
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.discover.Node;
 import org.tron.common.overlay.discover.NodeHandler;
-import org.tron.common.overlay.message.ReasonCode;
 import org.tron.common.overlay.server.TronChannelInitializer;
 import org.tron.core.config.args.Args;
 import org.tron.core.net.node.NodeImpl;
+import org.tron.protos.Protocol.ReasonCode;
 
 @Component
 public class PeerClient {

src/main/java/org/tron/common/overlay/discover/NodeStatistics.java

@@ -21,7 +21,7 @@
 import static java.lang.Math.min;
 
 import java.util.concurrent.atomic.AtomicLong;
-import org.tron.common.overlay.message.ReasonCode;
+import org.tron.protos.Protocol.ReasonCode;
 
 public class NodeStatistics {
 

src/main/java/org/tron/common/overlay/message/DisconnectMessage.java

@@ -1,8 +1,8 @@
 package org.tron.common.overlay.message;
 
-import com.google.protobuf.InvalidProtocolBufferException;
 import org.tron.core.net.message.MessageTypes;
 import org.tron.protos.Protocol;
+import org.tron.protos.Protocol.ReasonCode;
 
 public class DisconnectMessage extends P2pMessage {
 
@@ -16,7 +16,7 @@ public DisconnectMessage(byte type, byte[] rawData) throws Exception{
   public DisconnectMessage(ReasonCode reasonCode) {
     this.disconnectMessage = Protocol.DisconnectMessage
         .newBuilder()
-        .setReason(Protocol.ReasonCode.forNumber(reasonCode.getReason()))
+        .setReason(reasonCode)
         .build();
     this.type = MessageTypes.P2P_DISCONNECT.asByte();
     this.data = this.disconnectMessage.toByteArray();
@@ -26,6 +26,10 @@ public int getReason() {
     return this.disconnectMessage.getReason().getNumber();
   }
 
+  public ReasonCode getReasonCode() {
+    return disconnectMessage.getReason();
+  }
+
   @Override
   public String toString() {
     return new StringBuilder().append(super.toString()).append("reason: ").append(this.disconnectMessage.getReason()).toString();

src/main/java/org/tron/common/overlay/message/ReasonCode.java

@@ -36,12 +36,12 @@
 import org.tron.common.overlay.message.DisconnectMessage;
 import org.tron.common.overlay.message.HelloMessage;
 import org.tron.common.overlay.message.MessageCodec;
-import org.tron.common.overlay.message.ReasonCode;
 import org.tron.common.overlay.message.StaticMessages;
 import org.tron.core.db.ByteArrayWrapper;
 import org.tron.core.exception.P2pException;
 import org.tron.core.net.peer.PeerConnectionDelegate;
 import org.tron.core.net.peer.TronHandler;
+import org.tron.protos.Protocol.ReasonCode;
 
 @Component
 @Scope("prototype")

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

@@ -17,8 +17,8 @@
  */
 package org.tron.common.overlay.server;
 
-import static org.tron.common.overlay.message.ReasonCode.DUPLICATE_PEER;
-import static org.tron.common.overlay.message.ReasonCode.TOO_MANY_PEERS;
+import static org.tron.protos.Protocol.ReasonCode.DUPLICATE_PEER;
+import static org.tron.protos.Protocol.ReasonCode.TOO_MANY_PEERS;
 
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
@@ -36,9 +36,9 @@
 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.ReasonCode;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.ByteArrayWrapper;
+import org.tron.protos.Protocol.ReasonCode;
 
 
 @Component

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

@@ -34,10 +34,10 @@
 import org.tron.common.overlay.message.HelloMessage;
 import org.tron.common.overlay.message.P2pMessage;
 import org.tron.common.overlay.message.P2pMessageFactory;
-import org.tron.common.overlay.message.ReasonCode;
 import org.tron.core.config.args.Args;
 import org.tron.core.db.Manager;
 import org.tron.core.net.peer.PeerConnection;
+import org.tron.protos.Protocol.ReasonCode;
 
 @Component
 @Scope("prototype")
@@ -92,7 +92,8 @@ protected void decode(ChannelHandlerContext ctx, ByteBuf buffer, List<Object> ou
         break;
       case P2P_DISCONNECT:
         if (channel.getNodeStatistics() != null){
-          channel.getNodeStatistics().nodeDisconnectedRemote(ReasonCode.fromInt(((DisconnectMessage) msg).getReason()));
+          channel.getNodeStatistics()
+              .nodeDisconnectedRemote(((DisconnectMessage) msg).getReasonCode());
         }
         channel.close();
         break;

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

@@ -16,7 +16,7 @@
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.message.Message;
 import org.tron.common.overlay.message.PingMessage;
-import org.tron.common.overlay.message.ReasonCode;
+import org.tron.protos.Protocol.ReasonCode;
 
 @Component
 @Scope("prototype")

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

@@ -30,7 +30,6 @@
 import org.springframework.stereotype.Component;
 import org.tron.common.overlay.message.DisconnectMessage;
 import org.tron.common.overlay.message.P2pMessage;
-import org.tron.common.overlay.message.ReasonCode;
 
 @Component
 @Scope("prototype")
@@ -77,7 +76,8 @@ public void channelRead0(final ChannelHandlerContext ctx, P2pMessage msg) throws
         channel.getPeerStats().pong(sendPingTime);
         break;
       case P2P_DISCONNECT:
-        channel.getNodeStatistics().nodeDisconnectedRemote(ReasonCode.fromInt(((DisconnectMessage) msg).getReason()));
+        channel.getNodeStatistics()
+            .nodeDisconnectedRemote(((DisconnectMessage) msg).getReasonCode());
         channel.close();
         break;
       default:

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

@@ -60,9 +60,11 @@ public class LevelDbDataSourceImpl implements DbSourceInter<byte[]>,
    * constructor.
    */
   public LevelDbDataSourceImpl(String parentName, String name) {
-    parentName += Args.getInstance().getStorage().getDirectory();
-    this.parentName = parentName;
     this.dataBaseName = name;
+    this.parentName = Paths.get(
+            parentName,
+            Args.getInstance().getStorage().getDbDirectory()
+    ).toString();
   }
 
   @Override
@@ -79,7 +81,7 @@ public void initDB() {
         throw new NullPointerException("no name set to the dbStore");
       }
 
-      Options dbOptions = createDbOptions();
+      Options dbOptions = Args.getInstance().getStorage().getOptionsByDbName(dataBaseName);
 
       try {
         openDatabase(dbOptions);
@@ -109,6 +111,7 @@ private void openDatabase(Options dbOptions) throws IOException {
     }
   }
 
+  @Deprecated
   private Options createDbOptions() {
     Options dbOptions = new Options();
     dbOptions.createIfMissing(true);