Merge branch 'main' into khaeljy/issue404

kkrt-labs · Sep 30, 2023 · ca99f8e · ca99f8e
2 parents 116fea9 + 552087c
commit ca99f8e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/blockchain-tests-skip.yml b/blockchain-tests-skip.yml
@@ -372,6 +372,14 @@ filename:
     - NonZeroValue_DELEGATECALL_ToNonNonZeroBalance.json # ef-tests #360
     - NonZeroValue_DELEGATECALL_ToOneStorageKey.json # ef-tests #360
     - NonZeroValue_SUICIDE.json # ef-tests #361
+  stQuadraticComplexityTest:
+    - Call1MB1024Calldepth.json # ef-tests #375
+    - Call20KbytesContract50_1.json # ef-tests #375
+    - Call20KbytesContract50_2.json # ef-tests #375
+    - Call20KbytesContract50_3.json # ef-tests #375
+    - Return50000.json # ef-tests #375
+    - Return50000_2.json # ef-tests #375
+    - Create1000Shnghai.json # ef-tests #376
   stReturnDataTest:
     - returndatacopy_following_too_big_transfer.json # ef-tests #317
     - returndatasize_bug.json # ef-tests #317
@@ -452,9 +460,14 @@ filename:
     - stackOverflowM1PUSH.json # ef-tests #415
     - stackOverflowSWAP.json # ef-tests #415
     - stacksanitySWAP.json # ef-tests #415
+  stArgsZeroOneBalance:
+    - createNonConst.json # ef-tests #368
+    - mulmodNonConst.json # ef-tests #368
+    - suicideNonConst.json # ef-tests #370
+    - callNonConst.json # ef-tests #371
 
 # List of file names regex to be skipped
 # The first level corresponds to the directory, the second to the list of file names regex to ignore.
 regex:
   stBadOpcode:
-    - ^opc.*\.json$ # ef-test #120
+    - ^opc.*\.json$ # ef-test #120
diff --git a/crates/ef-testing/tests/tests.rs b/crates/ef-testing/tests/tests.rs
@@ -68,7 +68,7 @@ mod blockchain_tests {
     // Tests from the same folder with the same error can be aggregated in one issue
 
     blockchain_tests!(shanghai, Shanghai);
-    // blockchain_tests!(st_args_zero_one_balance, stArgsZeroOneBalance); // 4 failing tests
+    blockchain_tests!(st_args_zero_one_balance, stArgsZeroOneBalance);
     blockchain_tests!(st_attack_test, stAttackTest);
     blockchain_tests!(st_bad_opcode, stBadOpcode);
     blockchain_tests!(st_bugs, stBugs);
@@ -105,7 +105,7 @@ mod blockchain_tests {
     blockchain_tests!(st_non_zero_calls_test, stNonZeroCallsTest);
     // blockchain_tests!(st_pre_compiled_contracts, stPreCompiledContracts); // 8 failing tests
     // blockchain_tests!(st_pre_compiled_contracts2, stPreCompiledContracts2); // 97 failing tests
-    // blockchain_tests!(st_quadratic_complexity_test, stQuadraticComplexityTest); // 7 failing tests
+    blockchain_tests!(st_quadratic_complexity_test, stQuadraticComplexityTest);
     // blockchain_tests!(st_random, stRandom); // 79 failing tests
     // blockchain_tests!(st_random2, stRandom2); // 40 failing tests
     // blockchain_tests!(st_recursive_create, stRecursiveCreate); // 2 failing tests