fix failing tests in modPrecompiled after adding fork-properties

aionnetwork · Nov 19, 2018 · 0dc8939 · 0dc8939
1 parent 7ed73f0
commit 0dc8939
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 4 deletions.
diff --git a/modAionImpl/test/org/aion/zero/impl/cli/CliTest.java b/modAionImpl/test/org/aion/zero/impl/cli/CliTest.java
@@ -85,6 +85,7 @@ public class CliTest {
 
     private static final String configFileName = "config.xml";
     private static final String genesisFileName = "genesis.json";
+    private static final String forkFileName = "fork.properties";
 
     private static final String dataDirectory = "datadir";
     private static final String alternativeDirectory = "random";
@@ -102,6 +103,11 @@ public class CliTest {
     private static final File mainnetGenesis = new File(MAIN_CONFIG_PATH, genesisFileName);
     private static final File testnetGenesis = new File(TEST_CONFIG_PATH, genesisFileName);
 
+    private static final File fork = new File(TEST_RESOURCE_DIR, forkFileName);
+    private static final File oldFork = new File(CONFIG_PATH, forkFileName);
+    private static final File mainnetFork = new File(MAIN_CONFIG_PATH, forkFileName);
+    private static final File testnetFork = new File(TEST_CONFIG_PATH, forkFileName);
+
     /** @implNote set this to true to enable printing */
     private static final boolean verbose = false;
 
@@ -117,6 +123,7 @@ public void setup() {
             }
             Cli.copyRecursively(config, mainnetConfig);
             Cli.copyRecursively(genesis, mainnetGenesis);
+            Cli.copyRecursively(fork, mainnetFork);
         }
 
         if (BASE_PATH.contains(module) && !testnetConfig.exists()) {
@@ -126,6 +133,7 @@ public void setup() {
             }
             Cli.copyRecursively(config, mainnetConfig);
             Cli.copyRecursively(genesis, testnetGenesis);
+            Cli.copyRecursively(fork, testnetFork);
         }
 
         cfg.resetInternal();

diff --git a/modMcf/src/org/aion/mcf/config/CfgFork.java b/modMcf/src/org/aion/mcf/config/CfgFork.java
@@ -35,6 +35,7 @@ public void setProperties(Properties properties) {
     }
 
     public String getForkPropertyByNumber(final int forkNum) {
+        if (forkProperties == null) return null;
         return forkProperties.getProperty("fork" + String.valueOf(forkNum));
     }
 }
diff --git a/modPrecompiled/test/org/aion/precompiled/BenchmarkTest.java b/modPrecompiled/test/org/aion/precompiled/BenchmarkTest.java
@@ -27,6 +27,7 @@
 import org.aion.mcf.vm.types.DataWord;
 import org.aion.vm.ExecutionContext;
 import org.aion.vm.IPrecompiledContract;
+import org.aion.zero.impl.config.CfgAion;
 import org.apache.commons.lang3.RandomUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -48,12 +49,12 @@ public class BenchmarkTest {
     @Before
     public void setup() {
         cf = new ContractFactory();
-
+        CfgAion.inst().setForkProperties();
         txHash = RandomUtils.nextBytes(32);
         origin = Address.wrap(RandomUtils.nextBytes(32));
         caller = origin;
         blockCoinbase = Address.wrap(RandomUtils.nextBytes(32));
-        blockNumber = 1;
+        blockNumber = 2000001;
         blockTimestamp = System.currentTimeMillis() / 1000;
         blockNrgLimit = 5000000;
         blockDifficulty = new DataWord(0x100000000L);

diff --git a/modPrecompiled/test/org/aion/precompiled/TXHashTest.java b/modPrecompiled/test/org/aion/precompiled/TXHashTest.java
@@ -31,6 +31,7 @@
 import org.aion.vm.ExecutionContext;
 import org.aion.vm.ExecutionResult;
 import org.aion.vm.IPrecompiledContract;
+import org.aion.zero.impl.config.CfgAion;
 import org.apache.commons.lang3.RandomUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -44,10 +45,11 @@ public class TXHashTest {
 
     @Before
     public void setUp() {
+        CfgAion.inst().setForkProperties();
         ExecutionContext ctx = new ExecutionContext(txHash,
             ContractFactory.getTxHashContractAddress(), null, null, null,
             0L, null, null, 0, 0, 0, null,
-            0L, 0L, 0L,
+            2000001L, 0L, 0L,
             null);
 
         tXHashContract = new ContractFactory().getPrecompiledContract(ctx, null);

diff --git a/modPrecompiled/test/org/aion/precompiled/contracts/EDVerifyContractTest.java b/modPrecompiled/test/org/aion/precompiled/contracts/EDVerifyContractTest.java
@@ -37,6 +37,7 @@
 import org.aion.vm.ExecutionContext;
 import org.aion.vm.ExecutionResult;
 import org.aion.vm.IPrecompiledContract;
+import org.aion.zero.impl.config.CfgAion;
 import org.apache.commons.lang3.RandomUtils;
 import org.junit.Before;
 import org.junit.Test;
@@ -49,7 +50,7 @@ public class EDVerifyContractTest {
     private Address caller = origin;
 
     private Address blockCoinbase = Address.wrap(RandomUtils.nextBytes(32));
-    private long blockNumber = 1;
+    private long blockNumber = 2000001;
     private long blockTimestamp = System.currentTimeMillis() / 1000;
     private long blockNrgLimit = 5000000;
     private DataWord blockDifficulty = new DataWord(0x100000000L);
@@ -69,6 +70,7 @@ public void setup() {
         nrgLimit = 20000;
         callValue = DataWord.ZERO;
         callData = new byte[0];
+        CfgAion.inst().setForkProperties();
     }
 
     @Test