Update vm recursion error logs and defaults to match current env (#1147)

* Update vm recursion error logs and defaults to match current env * Revert to Xss2m for default run * Update xss recommendations
ethereum · Aug 6, 2018 · baf1c7d · baf1c7d
1 parent 7f341b0
commit baf1c7d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/ethereumj-core/src/main/java/org/ethereum/vm/VM.java b/ethereumj-core/src/main/java/org/ethereum/vm/VM.java
@@ -1326,7 +1326,7 @@ public void play(Program program) {
         } catch (RuntimeException e) {
             program.setRuntimeFailure(e);
         } catch (StackOverflowError soe){
-            logger.error("\n !!! StackOverflowError: update your java run command with -Xss2M !!!\n", soe);
+            logger.error("\n !!! StackOverflowError: update your java run command with -Xss2M (-Xss4M for tests) !!!\n", soe);
             System.exit(-1);
         } finally {
             callVmHookAction(program, VMHook::stopPlay);

diff --git a/ethereumj-core/src/test/java/org/ethereum/core/TransactionExecutionSummaryTest.java b/ethereumj-core/src/test/java/org/ethereum/core/TransactionExecutionSummaryTest.java
@@ -154,8 +154,13 @@ private static List<DataWord> randomDataWords(int count) {
     }
 
     private static InternalTransaction randomInternalTransaction(Transaction parent, int deep, int index) {
-        return new InternalTransaction(parent.getHash(), deep, index, randomBytes(1), DataWord.ZERO, DataWord.ZERO,
-                parent.getReceiveAddress(), randomBytes(20), randomBytes(2), randomBytes(64), "test note");
+        try {
+            return new InternalTransaction(parent.getHash(), deep, index, randomBytes(1), DataWord.ZERO, DataWord.ZERO,
+                    parent.getReceiveAddress(), randomBytes(20), randomBytes(2), randomBytes(64), "test note");
+        } catch (StackOverflowError e) {
+            System.out.println("\n !!! StackOverflowError: update your java run command with -Xss8M !!!\n");
+            throw e;
+        }
     }
 
     private static List<InternalTransaction> randomInternalTransactions(Transaction parent, int nestedLevelCount, int countByLevel) {

diff --git a/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/runners/StateTestRunner.java b/ethereumj-core/src/test/java/org/ethereum/jsontestsuite/suite/runners/StateTestRunner.java
@@ -80,7 +80,7 @@ protected ProgramResult executeTransaction(Transaction tx) {
             executor.go();
             executor.finalization();
         } catch (StackOverflowError soe){
-            logger.error(" !!! StackOverflowError: update your java run command with -Xss2M !!!");
+            logger.error(" !!! StackOverflowError: update your java run command with -Xss4M !!!");
             System.exit(-1);
         }