adapt old estimation test (which was overestimating)

rskj-core/src/test/java/co/rsk/mine/TransactionModuleTest.java

@@ -273,18 +273,18 @@ public void testGasEstimation() {
         BigInteger nonce = repository.getAccountState(srcAddr).getNonce();
         RskAddress contractAddress = new RskAddress(HashUtil.calcNewAddr(srcAddr.getBytes(), nonce.toByteArray()));
         int gasLimit = 5000000; // start with 5M
-        int consumed = checkEstimateGas(callCallWithValue, 33557,gasLimit,srcAddr,contractAddress,web3, repository);
+        int consumed = checkEstimateGas(callCallWithValue, 33472,gasLimit,srcAddr,contractAddress,web3, repository);
 
         // Now that I know the estimation, call again using the estimated value
         // it should not fail. We set the gasLimit to the expected value plus 1 to
         // differentiate between OOG and success.
-        int consumed2 = checkEstimateGas(callCallWithValue,33557,consumed+1, srcAddr,contractAddress,web3, repository);
+        int consumed2 = checkEstimateGas(callCallWithValue,33472,consumed+1, srcAddr,contractAddress,web3, repository);
+
         Assert.assertEquals(consumed,consumed2);
 
-        consumed = checkEstimateGas(callUnfill, 46942,
-                gasLimit,srcAddr,contractAddress,web3, repository);
-        consumed2 = checkEstimateGas(callUnfill, 46942,
-                consumed+1,srcAddr,contractAddress,web3, repository);
+        consumed = checkEstimateGas(callUnfill, 46942, gasLimit,srcAddr,contractAddress,web3, repository);
+        consumed2 = checkEstimateGas(callUnfill, 46942, consumed+1,srcAddr,contractAddress,web3, repository);
+
         Assert.assertEquals(consumed,consumed2);
     }
 
@@ -303,7 +303,7 @@ public int checkEstimateGas(int method,int expectedValue,int gasLimit,
         BigInteger gasReturned =BigIntegers.fromUnsignedByteArray(gasReturnedBytes);
         int gasReturnedInt = gasReturned.intValueExact();
         Assert.assertNotEquals(gasReturnedInt,gasLimit);
-        Assert.assertEquals(gasReturnedInt, expectedValue);
+        Assert.assertEquals(expectedValue, gasReturnedInt);
         return gasReturnedInt;
     }