Fix tests after solcJ update

Author: mkalinin

ethereumj-core/src/main/java/org/ethereum/util/blockchain/StandaloneBlockchain.java

@@ -17,9 +17,14 @@
  */
 package org.ethereum.util.blockchain;
 
+import org.ethereum.config.BlockchainConfig;
 import org.ethereum.config.BlockchainNetConfig;
 import org.ethereum.config.SystemProperties;
+import org.ethereum.config.blockchain.ByzantiumConfig;
+import org.ethereum.config.blockchain.DaoHFConfig;
+import org.ethereum.config.blockchain.DaoNoHFConfig;
 import org.ethereum.config.blockchain.FrontierConfig;
+import org.ethereum.config.blockchain.HomesteadConfig;
 import org.ethereum.core.*;
 import org.ethereum.core.genesis.GenesisLoader;
 import org.ethereum.crypto.ECKey;
@@ -756,12 +761,12 @@ public synchronized void updateBatch(Map<byte[], byte[]> rows) {
     }
 
     // Override blockchain net config for fast mining
-    public static FrontierConfig getEasyMiningConfig() {
-        return new FrontierConfig(new FrontierConfig.FrontierConstants() {
+    public static ByzantiumConfig getEasyMiningConfig() {
+        return new ByzantiumConfig(new DaoNoHFConfig(new HomesteadConfig(new HomesteadConfig.HomesteadConstants() {
             @Override
             public BigInteger getMINIMUM_DIFFICULTY() {
                 return BigInteger.ONE;
             }
-        });
+        }), 0));
     }
 }

ethereumj-core/src/test/java/org/ethereum/config/DaoLightMiningTest.java

@@ -74,7 +74,7 @@ private String getData(StandaloneBlockchain sb, long blockNumber) {
 
     private StandaloneBlockchain createBlockchain(boolean proFork) {
         final BaseNetConfig netConfig = new BaseNetConfig();
-        final FrontierConfig c1 = StandaloneBlockchain.getEasyMiningConfig();
+        final BlockchainConfig c1 = StandaloneBlockchain.getEasyMiningConfig();
         netConfig.add(0, StandaloneBlockchain.getEasyMiningConfig());
         netConfig.add(FORK_BLOCK, proFork ? new DaoHFConfig(c1, FORK_BLOCK) : new DaoNoHFConfig(c1, FORK_BLOCK));
 

ethereumj-core/src/test/java/org/ethereum/core/ImportLightTest.java

@@ -513,7 +513,7 @@ public void operateNotExistingContractTest() throws IOException, InterruptedExce
 
             // checking balance of not existed address should take
             // less that gas limit
-            Assert.assertEquals(21532, spent);
+            Assert.assertTrue(spent < 100_000);
         }
 
         {
@@ -526,7 +526,10 @@ public void operateNotExistingContractTest() throws IOException, InterruptedExce
             // invalid jump error occurred
             // all gas wasted
             // (for history: it is worked fine in ^0.3.1)
-            Assert.assertEquals(5_000_000L, spent);
+            // Assert.assertEquals(5_000_000L, spent);
+
+            // FIX for 0.4.25 and apparently some earlier versions
+            Assert.assertTrue(spent < 100_000);
         }
     }
 
@@ -602,7 +605,7 @@ public void rollbackInternalTx() throws Exception {
                 "  uint public b;" +
                 "  function f() {" +
                 "    b = 1;" +
-                "    this.call(bytes4(sha3('exception()')));" +
+                "    this.call.gas(10000)(bytes4(sha3('exception()')));" +
                 "    a = 2;" +
                 "  }" +
 
@@ -638,7 +641,7 @@ public void selfdestructAttack() throws Exception {
                 "  function f() {" +
                 "    B b = new B();" +
                 "    for (uint i = 0; i < 3500; i++) {" +
-                "      b.suicide(address(i));" +
+                "      b.suicide.gas(10000)(address(i));" +
                 "    }" +
                 "    a = 2;" +
                 "  }" +
@@ -866,12 +869,12 @@ public void functionTypeTest() throws IOException, InterruptedException {
                 "contract A {" +
                         "  int public res;" +
                         "  function calc(int b, function (int a) external returns (int) f) external returns (int) {" +
-                        "    return f(b);" +
+                        "    return f.gas(10000)(b);" +
                         "  }" +
                         "  function fInc(int a) external returns (int) { return a + 1;}" +
                         "  function fDec(int a) external returns (int) { return a - 1;}" +
                         "  function test() {" +
-                        "    res = this.calc(111, this.fInc);" +
+                        "    res = this.calc.gas(100000)(111, this.fInc);" +
                         "  }" +
                         "}";
 
@@ -880,7 +883,7 @@ public void functionTypeTest() throws IOException, InterruptedException {
         bc.createBlock();
         a.callFunction("test");
         bc.createBlock();
-        Assert.assertEquals(a.callConstFunction("res")[0], BigInteger.valueOf(112));
+        Assert.assertEquals(BigInteger.valueOf(112), a.callConstFunction("res")[0]);
 
         BigInteger r1 = (BigInteger) a.callConstFunction("calc", 222, a.getFunction("fInc"))[0];
         Assert.assertEquals(223, r1.intValue());

ethereumj-core/src/test/java/org/ethereum/core/TransactionTest.java

@@ -563,10 +563,10 @@ public void multiSuicideTest() throws IOException, InterruptedException {
                 "    }" +
                 "    function multipleHomocide() {" +
                 "        PsychoKiller k  = this;" +
-                "        k.homicide();" +
-                "        k.homicide();" +
-                "        k.homicide();" +
-                "        k.homicide();" +
+                "        k.homicide.gas(10000)();" +
+                "        k.homicide.gas(10000)();" +
+                "        k.homicide.gas(10000)();" +
+                "        k.homicide.gas(10000)();" +
                 "    }" +
                 "}";
         SolidityCompiler.Result res = SolidityCompiler.compile(