Merge pull request tronprotocol#1590 from tronprotocol/fix_debug

Fix debug
Elliot438b · Oct 11, 2018 · ecf806f · ecf806f
2 parents 419129c + cce83a4
commit ecf806f
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 18 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,5 @@
 buildscript {
     repositories {
-        maven { url 'http://mvnrepository.com' }
         mavenCentral()
         jcenter()
     }
@@ -46,7 +45,6 @@ task sourceJar(type: Jar, dependsOn: classes) {
 }
 
 repositories {
-    maven { url 'http://mvnrepository.com' }
     mavenLocal()
     mavenCentral()
     maven { url 'http://repo.spring.io/plugins-release' }

diff --git a/src/main/java/org/tron/common/runtime/vm/program/Program.java b/src/main/java/org/tron/common/runtime/vm/program/Program.java
@@ -34,13 +34,11 @@
 import java.math.BigInteger;
 import java.util.Arrays;
 import java.util.BitSet;
-import java.util.List;
 import java.util.Map;
 import java.util.NavigableSet;
 import java.util.Objects;
 import java.util.TreeSet;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.tuple.Pair;
 import org.spongycastle.util.encoders.Hex;
@@ -804,10 +802,9 @@ public DataWord getBlockHash(int index) {
     if (index < this.getNumber().longValue()
         && index >= Math.max(256, this.getNumber().longValue()) - 256) {
 
-      List<BlockCapsule> blocks = this.invoke.getBlockStore().getBlockByLatestNum(index);
+      BlockCapsule blockCapsule = this.invoke.getBlockByNum(index);
 
-      if (CollectionUtils.isNotEmpty(blocks)) {
-        BlockCapsule blockCapsule = blocks.get(0);
+      if (Objects.nonNull(blockCapsule)) {
         return new DataWord(blockCapsule.getBlockId().getBytes());
       } else {
         return DataWord.ZERO.clone();

diff --git a/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvoke.java b/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvoke.java
@@ -19,6 +19,7 @@
 
 import org.tron.common.runtime.vm.DataWord;
 import org.tron.common.storage.Deposit;
+import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.db.BlockStore;
 
 /**
@@ -72,4 +73,6 @@ public interface ProgramInvoke {
   long getEnergyLimit();
 
   void setStaticCall();
+
+  BlockCapsule getBlockByNum(int index);
 }
diff --git a/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeImpl.java b/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeImpl.java
@@ -22,8 +22,11 @@
 import java.util.Objects;
 import lombok.extern.slf4j.Slf4j;
 import org.tron.common.runtime.vm.DataWord;
+import org.tron.common.runtime.vm.program.Program.IllegalOperationException;
 import org.tron.common.storage.Deposit;
+import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.db.BlockStore;
+import org.tron.core.exception.StoreException;
 
 @Slf4j
 public class ProgramInvokeImpl implements ProgramInvoke {
@@ -374,4 +377,13 @@ public void setStaticCall() {
     isStaticCall = true;
   }
 
+  @Override
+  public BlockCapsule getBlockByNum(int index) {
+    try {
+      return deposit.getDbManager().getBlockByNum(index);
+    } catch (StoreException e) {
+      throw new IllegalOperationException("cannot find block num");
+    }
+  }
+
 }
diff --git a/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeMockImpl.java b/src/main/java/org/tron/common/runtime/vm/program/invoke/ProgramInvokeMockImpl.java
@@ -21,9 +21,12 @@
 import org.tron.common.crypto.ECKey;
 import org.tron.common.crypto.Hash;
 import org.tron.common.runtime.vm.DataWord;
+import org.tron.common.runtime.vm.program.Program.IllegalOperationException;
 import org.tron.common.storage.Deposit;
 import org.tron.common.storage.DepositImpl;
+import org.tron.core.capsule.BlockCapsule;
 import org.tron.core.db.BlockStore;
+import org.tron.core.exception.StoreException;
 import org.tron.protos.Protocol;
 
 // import org.tron.core.db.BlockStoreDummy;
@@ -234,6 +237,15 @@ public void setStaticCall() {
 
   }
 
+  @Override
+  public BlockCapsule getBlockByNum(int index) {
+    try {
+      return deposit.getDbManager().getBlockByNum(index);
+    } catch (StoreException e) {
+      throw new IllegalOperationException("cannot find block num");
+    }
+  }
+
   @Override
   public boolean byTestingSuite() {
     return false;

diff --git a/src/main/java/org/tron/common/utils/ForkController.java b/src/main/java/org/tron/common/utils/ForkController.java
@@ -22,11 +22,11 @@ public class ForkController {
   @Getter
   private Manager manager;
   private volatile int[] slots = new int[0];
-  private boolean forked;
+  private boolean forked = true;
 
   public void init(Manager manager) {
     this.manager = manager;
-    forked = manager.getDynamicPropertiesStore().getForked();
+    forked = true;
   }
 
   public synchronized boolean shouldBeForked() {

diff --git a/src/main/java/org/tron/core/config/args/Args.java b/src/main/java/org/tron/core/config/args/Args.java
@@ -1,8 +1,5 @@
 package org.tron.core.config.args;
 
-import static java.lang.Math.max;
-import static java.lang.Math.min;
-
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
 import com.typesafe.config.Config;
@@ -82,7 +79,7 @@ public class Args {
   @Getter
   @Setter
   @Parameter(names = {"--min-time-ratio"})
-  private double minTimeRatio = 0.6;
+  private double minTimeRatio = 0.0;
 
   @Getter
   @Setter
@@ -391,7 +388,7 @@ public static void clearParam() {
     INSTANCE.isOpenFullTcpDisconnect = false;
     INSTANCE.supportConstant = false;
     INSTANCE.debug = false;
-    INSTANCE.minTimeRatio = 0.6;
+    INSTANCE.minTimeRatio = 0.0;
     INSTANCE.maxTimeRatio = 5.0;
     INSTANCE.longRunningTime = 10;
   }
@@ -542,7 +539,8 @@ public static void setParam(final String[] args, final String confFileName) {
         config.hasPath("node.maxActiveNodes") ? config.getInt("node.maxActiveNodes") : 30;
 
     INSTANCE.nodeMaxActiveNodesWithSameIp =
-        config.hasPath("node.maxActiveNodesWithSameIp") ? config.getInt("node.maxActiveNodesWithSameIp") : 2;
+        config.hasPath("node.maxActiveNodesWithSameIp") ? config
+            .getInt("node.maxActiveNodesWithSameIp") : 2;
 
     INSTANCE.minParticipationRate =
         config.hasPath("node.minParticipationRate") ? config.getInt("node.minParticipationRate")
@@ -649,7 +647,8 @@ public static void setParam(final String[] args, final String confFileName) {
         config.getLong("node.receiveTcpMinDataLength") : 2048;
     INSTANCE.isOpenFullTcpDisconnect = config.hasPath("node.isOpenFullTcpDisconnect") && config
         .getBoolean("node.isOpenFullTcpDisconnect");
-    INSTANCE.logLevel = config.hasPath("log.level.root") ? config.getString("log.level.root") : "INFO";
+    INSTANCE.logLevel =
+        config.hasPath("log.level.root") ? config.getString("log.level.root") : "INFO";
 
     initBackupProperty(config);
 
@@ -837,7 +836,8 @@ public ECKey getMyKey() {
   }
 
   private static double calcMaxTimeRatio() {
-    return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));
+    //return max(2.0, min(5.0, 5 * 4.0 / max(Runtime.getRuntime().availableProcessors(), 1)));
+    return 5.0;
   }
 
   private static void initBackupProperty(Config config) {
@@ -849,7 +849,7 @@ private static void initBackupProperty(Config config) {
         ? config.getStringList("node.backup.members") : new ArrayList<>();
   }
 
-  private static void logConfig(){
+  private static void logConfig() {
     Args args = getInstance();
     logger.info("\n");
     logger.info("************************ Net config ************************");