Update reference tests (#139)

EF's testing team published the first version of the 7.0.0 reference tests.

* Update some blacklist patterns to catch all future fork names
* Ignore a new "postStateHash" json property
* Ignore test randomStatetest94 as it is too memory heavy to run in parallel
* Update file pattern as a stray test sits alone in one directory

Signed-off-by: Danno Ferrin <danno.ferrin@gmail.com>
pull/181/head
Danno Ferrin 5 years ago committed by GitHub
parent 233646ba80
commit 7ec95307e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      ethereum/core/build.gradle
  2. 2
      ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestCaseSpec.java
  3. 6
      ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/BlockchainReferenceTestTools.java
  4. 2
      ethereum/core/src/test/java/org/hyperledger/besu/ethereum/vm/GeneralStateReferenceTestTools.java
  5. 2
      ethereum/referencetests/src/test/resources

@ -108,7 +108,9 @@ def generateTestFiles(FileTree jsonPath, File templateFile, String pathstrip, St
if (!testJsonFile.getName().toString().startsWith(".")) {
String parentDirectory = testJsonFile.getParentFile().getName()
String testFile = testJsonFile.getName()
if(testJsonFile.getParentFile().getParentFile().getName() != pathstrip) {
if(testJsonFile.getParentFile().getName() == pathstrip) {
paths << pathstrip + "/" + testFile
} else if(testJsonFile.getParentFile().getParentFile().getName() != pathstrip) {
paths << pathstrip + "/" + testJsonFile.getParentFile().getParentFile().getName() + "/" + parentDirectory + "/" + testFile
} else {
paths << pathstrip + "/" + parentDirectory + "/" + testFile

@ -43,7 +43,7 @@ import com.fasterxml.jackson.annotation.JsonCreator;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
@JsonIgnoreProperties({"_info", "postState"})
@JsonIgnoreProperties({"_info", "postState", "postStateHash"})
public class BlockchainReferenceTestCaseSpec {
private final String network;

@ -67,8 +67,10 @@ public class BlockchainReferenceTestTools {
"RevertPrecompiledTouch(_storage)?_d(0|3)g0v0_(EIP158|Byzantium|Constantinople|ConstantinopleFix)");
// Consumes a huge amount of memory
params.blacklist(
"static_Call1MB1024Calldepth_d1g0v0_(Byzantium|Constantinople|ConstantinopleFix)");
params.blacklist("static_Call1MB1024Calldepth_d1g0v0_\\w+");
// Absurd amount of gas, doesn't run in parallel
params.blacklist("randomStatetest94_\\w+");
}
public static Collection<Object[]> generateTestParametersForConfig(final String[] filePath) {

@ -88,7 +88,7 @@ public class GeneralStateReferenceTestTools {
// Gas integer value is too large to construct a valid transaction.
params.blacklist("OverflowGasRequire");
// Consumes a huge amount of memory
params.blacklist("static_Call1MB1024Calldepth-(Byzantium|Constantinople|ConstantinopleFix)");
params.blacklist("static_Call1MB1024Calldepth-\\w");
}
public static Collection<Object[]> generateTestParametersForConfig(final String[] filePath) {

@ -1 +1 @@
Subproject commit 0327d9f76ce2a292a99e7a9dfc93627368ce589e
Subproject commit cfbcd15f91d4d6e1785d9cae5c5c37f47e8bad46
Loading…
Cancel
Save