Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Increase scope of reference tests #6287

Merged
merged 1 commit into from
Dec 13, 2023
Merged

Increase scope of reference tests #6287

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 30 additions & 3 deletions ...encetests/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,15 @@
import org.hyperledger.besu.ethereum.transaction.TransactionInvalidReason;
import org.hyperledger.besu.evm.gascalculator.BerlinGasCalculator;
import org.hyperledger.besu.evm.gascalculator.ByzantiumGasCalculator;
import org.hyperledger.besu.evm.gascalculator.CancunGasCalculator;
import org.hyperledger.besu.evm.gascalculator.ConstantinopleGasCalculator;
import org.hyperledger.besu.evm.gascalculator.FrontierGasCalculator;
import org.hyperledger.besu.evm.gascalculator.GasCalculator;
import org.hyperledger.besu.evm.gascalculator.HomesteadGasCalculator;
import org.hyperledger.besu.evm.gascalculator.IstanbulGasCalculator;
import org.hyperledger.besu.evm.gascalculator.LondonGasCalculator;
import org.hyperledger.besu.evm.gascalculator.PetersburgGasCalculator;
import org.hyperledger.besu.evm.gascalculator.ShanghaiGasCalculator;
import org.hyperledger.besu.evm.gascalculator.SpuriousDragonGasCalculator;
import org.hyperledger.besu.evm.gascalculator.TangerineWhistleGasCalculator;
import org.hyperledger.besu.testutil.JsonTestParameters;
Expand All @@ -54,15 +56,18 @@ private static TransactionValidator transactionValidator(final String name) {
return REFERENCE_TEST_PROTOCOL_SCHEDULES
.getByName(name)
.getByBlockHeader(BlockHeaderBuilder.createDefault().buildBlockHeader())
.getTransactionValidatorFactory().get();
.getTransactionValidatorFactory()
.get();
}

private static final String TEST_CONFIG_FILE_DIR_PATH = "TransactionTests/";

public static Stream<Arguments> getTestParametersForConfig() {
return JsonTestParameters.create(TransactionTestCaseSpec.class)
.generator((name, fullPath, spec, collector) -> collector.add(name, fullPath, spec, true))
.generate(TEST_CONFIG_FILE_DIR_PATH).stream().map(params -> Arguments.of(params[0], params[1]));
.generate(TEST_CONFIG_FILE_DIR_PATH)
.stream()
.map(params -> Arguments.of(params[0], params[1]));
}

@ParameterizedTest(name = "Name: {0}")
Expand Down Expand Up @@ -125,8 +130,30 @@ public void london(final String name, final TransactionTestCaseSpec spec) {
milestone(spec, name, "London", new LondonGasCalculator(), Optional.of(Wei.of(0)));
}

@ParameterizedTest(name = "Name: {0}")
@MethodSource("getTestParametersForConfig")
public void merge(final String name, final TransactionTestCaseSpec spec) {
milestone(spec, name, "Merge", new LondonGasCalculator(), Optional.of(Wei.of(0)));
}

@ParameterizedTest(name = "Name: {0}")
@MethodSource("getTestParametersForConfig")
public void shanghai(final String name, final TransactionTestCaseSpec spec) {
milestone(spec, name, "Shanghai", new ShanghaiGasCalculator(), Optional.of(Wei.of(0)));
}

@ParameterizedTest(name = "Name: {0}")
@MethodSource("getTestParametersForConfig")
public void cancun(final String name, final TransactionTestCaseSpec spec) {
milestone(spec, name, "Cancun", new CancunGasCalculator(), Optional.of(Wei.of(0)));
diega marked this conversation as resolved.
Show resolved Hide resolved
}

public void milestone(
final TransactionTestCaseSpec spec, final String name, final String milestone, final GasCalculator gasCalculator, final Optional<Wei> baseFee) {
final TransactionTestCaseSpec spec,
final String name,
final String milestone,
final GasCalculator gasCalculator,
final Optional<Wei> baseFee) {

final TransactionTestCaseSpec.Expectation expected = spec.expectation(milestone);

Expand Down
5 changes: 2 additions & 3 deletions ...s/src/reference-test/java/org/hyperledger/besu/ethereum/core/TransactionTestCaseSpec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.tuweni.bytes.Bytes;
import org.junit.jupiter.api.Assumptions;

/** A Transaction test case specification. */
@JsonIgnoreProperties({"_info"})
Expand Down Expand Up @@ -109,9 +110,7 @@ public Bytes getRlp() {
public Expectation expectation(final String milestone) {
final Expectation expectation = expectations.get(milestone);

if (expectation == null) {
throw new IllegalStateException("Expectation for milestone " + milestone + " not found");
}
Assumptions.assumeFalse(expectation == null, () -> "No expectation for milestone " + milestone);

return expectation;
}
Expand Down
33 changes: 28 additions & 5 deletions .../referencetests/src/reference-test/java/org/hyperledger/besu/ethereum/rlp/RLPRefTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,59 @@

import static org.junit.jupiter.api.Assumptions.assumeTrue;

import org.assertj.core.api.Assertions;
import org.hyperledger.besu.ethereum.rlp.util.RLPTestUtil;
import org.hyperledger.besu.testutil.JsonTestParameters;

import java.util.stream.Stream;

import org.apache.tuweni.bytes.Bytes;
import org.assertj.core.api.Assertions;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

/** The Ethereum reference RLP tests. */
public class RLPRefTest {

private static final String TEST_CONFIG_FILES = "RLPTests/rlptest.json";
private static final String[] TEST_CONFIG_FILES = {
"RLPTests/rlptest.json", "RLPTests/invalidRLPTest.json"
};

private static final Bytes INVALID = Bytes.fromHexString("0x494e56414c4944");

public static Stream<Arguments> getTestParametersForConfig() {
return JsonTestParameters.create(RLPRefTestCaseSpec.class).generate(TEST_CONFIG_FILES).stream().map(params -> Arguments.of(params[0], params[1], params[2]));
return JsonTestParameters.create(RLPRefTestCaseSpec.class).generate(TEST_CONFIG_FILES).stream()
.map(params -> Arguments.of(params[0], params[1], params[2]));
}

@ParameterizedTest(name = "Name: {0}")
@MethodSource("getTestParametersForConfig")
public void encode(final String name, final RLPRefTestCaseSpec spec, final boolean runTest) {
assumeTrue(runTest, "Test was blacklisted");
Assertions.assertThat(RLPTestUtil.encode(spec.getIn())).isEqualTo(spec.getOut());
if (!spec.getIn().equals(INVALID)) {
Assertions.assertThat(RLPTestUtil.encode(spec.getIn())).isEqualTo(spec.getOut());
}
}

@ParameterizedTest(name = "Name: {0}")
@MethodSource("getTestParametersForConfig")
public void decode(final String name, final RLPRefTestCaseSpec spec, final boolean runTest) {
assumeTrue(runTest, "Test was blacklisted");
Assertions.assertThat(RLPTestUtil.decode(spec.getOut())).isEqualTo(spec.getIn());
if (spec.getIn().equals(INVALID)) {
Assertions.assertThatThrownBy(() -> RLPTestUtil.decode(spec.getOut()))
.isInstanceOf(RLPException.class);
Assertions.assertThatThrownBy(() -> decode2(RLP.input(spec.getOut())))
.isInstanceOf(RLPException.class);
} else {
Assertions.assertThat(RLPTestUtil.decode(spec.getOut())).isEqualTo(spec.getIn());
}
}

private static Object decode2(final RLPInput in) {
if (in.nextIsList()) {
return in.readList(RLPRefTest::decode2);
} else {
return in.readBytes();
}
}
}
Loading