From 1f479f75fda3dd4ac5b21f968bcbd7cb732f708f Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Thu, 18 Oct 2018 00:07:34 +1000 Subject: [PATCH] Enable more Constantinople reference tests that are now passing. (#82) --- .../vm/BlockchainReferenceTestTools.java | 40 ------------------- .../vm/GeneralStateReferenceTestTools.java | 37 ----------------- 2 files changed, 77 deletions(-) diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java index af62dac2f3..b43e11e5e6 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/BlockchainReferenceTestTools.java @@ -78,50 +78,10 @@ public class BlockchainReferenceTestTools { params.blacklist("RevertInCreateInInit_d0g0v0_Constantinople"); // Constantinople failures to investigate - params.blacklist("badOpcodes_d115g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024PreCalls_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBombPreCall_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024BalanceTooLow_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Callcode1024BalanceTooLow_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Callcode1024OOG_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Delegatecall1024OOG_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Callcode1024BalanceTooLow_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024BalanceTooLow_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024PreCalls_d0g0v0_Constantinople\\[Constantinople\\]"); params.blacklist("create2collisionStorage_d0g0v0_Constantinople\\[Constantinople\\]"); params.blacklist("create2collisionStorage_d1g0v0_Constantinople\\[Constantinople\\]"); params.blacklist("create2collisionStorage_d2g0v0_Constantinople\\[Constantinople\\]"); params.blacklist("RevertInCreateInInitCreate2_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CreateMessageReverted_d0g1v0_Constantinople\\[Constantinople\\]"); - params.blacklist( - "returndatasize_following_successful_create_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CreateMessageRevertedOOGInInit_d0g1v0_Constantinople\\[Constantinople\\]"); - params.blacklist( - "returndatacopy_0_0_following_successful_create_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024OOG_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024PreCalls_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBombPreCall_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Delegatecall1024_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024BalanceTooLow_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1MB1024Calldepth_d0g1v0_Constantinople\\[Constantinople\\]"); - params.blacklist("LoopCallsThenRevert_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("LoopCallsDepthThenRevert2_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("LoopCallsDepthThenRevert_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("LoopCallsDepthThenRevert3_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("LoopDelegateCallsDepthThenRevert_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("LoopCallsThenRevert_d0g1v0_Constantinople\\[Constantinople\\]"); - params.blacklist("Call1024OOG_d0g1v0_Constantinople\\[Constantinople\\]"); - params.blacklist("static_Call1024PreCalls2_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("ABAcalls2_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBombLog2_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBomb0_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBombLog_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBomb2_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBomb3_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("ABAcalls3_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist("CallRecursiveBomb1_d0g0v0_Constantinople\\[Constantinople\\]"); - params.blacklist( - "CallRecursiveBomb0_OOG_atMaxCallDepth_d0g0v0_Constantinople\\[Constantinople\\]"); } public static Collection generateTestParametersForConfig(final String[] filePath) { diff --git a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java index b1bebbf893..570216764a 100644 --- a/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java +++ b/ethereum/core/src/test/java/tech/pegasys/pantheon/ethereum/vm/GeneralStateReferenceTestTools.java @@ -145,48 +145,11 @@ public class GeneralStateReferenceTestTools { params.blacklist("ecmul_0-3_5616_28000_96-Byzantium\\[3\\]"); // Constantinople failures to investigate - params.blacklist("badOpcodes-Constantinople\\[115\\]"); - params.blacklist("Call1024OOG-Constantinople\\[0\\]"); - params.blacklist("Call1024OOG-Constantinople\\[1\\]"); - params.blacklist("CallRecursiveBombPreCall-Constantinople"); - params.blacklist("Call1024PreCalls-Constantinople"); - params.blacklist("Callcode1024OOG-Constantinople"); - params.blacklist("Callcode1024BalanceTooLow-Constantinople"); - params.blacklist("Call1024BalanceTooLow-Constantinople"); - params.blacklist("Callcode1024BalanceTooLow-Constantinople"); - params.blacklist("Call1024PreCalls-Constantinople"); - params.blacklist("CallRecursiveBombLog2-Constantinople"); params.blacklist("RevertInCreateInInitCreate2-Constantinople"); - params.blacklist("returndatacopy_0_0_following_successful_create-Constantinople"); - params.blacklist("CreateMessageRevertedOOGInInit-Constantinople\\[1\\]"); - params.blacklist("returndatasize_following_successful_create-Constantinople"); params.blacklist("create2collisionStorage-Constantinople\\[0\\]"); params.blacklist("create2collisionStorage-Constantinople\\[1\\]"); params.blacklist("create2collisionStorage-Constantinople\\[2\\]"); - params.blacklist("Call1024OOG-Constantinople"); - params.blacklist("Delegatecall1024OOG-Constantinople"); - params.blacklist("CallRecursiveBombPreCall-Constantinople"); - params.blacklist("Call1024PreCalls-Constantinople"); - params.blacklist("Delegatecall1024-Constantinople"); - params.blacklist("Call1MB1024Calldepth-Constantinople\\[1\\]"); - params.blacklist("LoopCallsDepthThenRevert3-Constantinople"); - params.blacklist("LoopCallsDepthThenRevert-Constantinople"); - params.blacklist("LoopDelegateCallsDepthThenRevert-Constantinople"); - params.blacklist("LoopCallsThenRevert-Constantinople\\[0\\]"); - params.blacklist("LoopCallsThenRevert-Constantinople\\[1\\]"); params.blacklist("RevertInCreateInInit-Constantinople"); - params.blacklist("LoopCallsDepthThenRevert2-Constantinople"); - params.blacklist("Call1024BalanceTooLow-Constantinople"); - params.blacklist("Call1024BalanceTooLow-Constantinople"); - params.blacklist("static_Call1024PreCalls2-Constantinople\\[0\\]"); - params.blacklist("CallRecursiveBomb0_OOG_atMaxCallDepth-Constantinople"); - params.blacklist("CallRecursiveBomb3-Constantinople"); - params.blacklist("ABAcalls3-Constantinople"); - params.blacklist("CallRecursiveBomb2-Constantinople"); - params.blacklist("CallRecursiveBombLog-Constantinople"); - params.blacklist("CallRecursiveBomb0-Constantinople"); - params.blacklist("CallRecursiveBomb1-Constantinople"); - params.blacklist("ABAcalls2-Constantinople"); params.blacklist("ecmul_0-3_5616_28000_96-Constantinople\\[3\\]"); }