Skip to content

Commit d7a65dd

Browse files
committed
Revert "Reapply "migrate tests to Osaka""
This reverts commit 75e96d7.
1 parent a325412 commit d7a65dd

31 files changed

+169
-46
lines changed

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/BlobTransactionDenialTest.java

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,18 @@
2828
* Tests that verify the LineaTransactionValidationPlugin correctly rejects BLOB transactions from
2929
* being executed
3030
*/
31-
public class BlobTransactionDenialTest extends LineaPluginPoSTestBase {
31+
public class BlobTransactionDenialTest extends LineaPluginTestBasePrague {
3232
private Web3j web3j;
3333
private Credentials credentials;
3434
private String recipient;
3535

36+
@Override
37+
protected String getGenesisFileTemplatePath() {
38+
// We cannot use clique-prague-zero-blobs because `config.blobSchedule.prague.max = 0` will
39+
// block all blob txs
40+
return "/clique/clique-prague-one-blob.json.tpl";
41+
}
42+
3643
@Override
3744
@BeforeEach
3845
public void setup() throws Exception {

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/BlockGasLimitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.web3j.tx.TransactionManager;
2020

2121
/** This class tests the block gas limit functionality of the plugin. */
22-
public class BlockGasLimitTest extends LineaPluginPoSTestBase {
22+
public class BlockGasLimitTest extends LineaPluginTestBasePrague {
2323

2424
private static final BigInteger GAS_PRICE = BigInteger.TEN.pow(9);
2525
private static final BigInteger VALUE = BigInteger.TWO;

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/EIP7702TransactionDenialTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* Tests that verify the LineaTransactionValidationPlugin correctly rejects EIP7702 DELEGATE_CODE
2929
* transactions from being executed
3030
*/
31-
public class EIP7702TransactionDenialTest extends LineaPluginPoSTestBase {
31+
public class EIP7702TransactionDenialTest extends LineaPluginTestBasePrague {
3232
private Web3j web3j;
3333
private Credentials credentials;
3434
private String recipient;

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/EcDataLimitsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
import org.web3j.protocol.core.methods.response.EthSendTransaction;
3535
import org.web3j.utils.Numeric;
3636

37-
public class EcDataLimitsTest extends LineaPluginPoSTestBase {
37+
public class EcDataLimitsTest extends LineaPluginTestBasePrague {
3838

3939
@Override
4040
public List<String> getTestCliOptions() {

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/ExcludedPrecompilesLimitlessTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.web3j.tx.gas.DefaultGasProvider;
3030
import org.web3j.utils.Numeric;
3131

32-
public class ExcludedPrecompilesLimitlessTest extends LineaPluginPoSTestBase {
32+
public class ExcludedPrecompilesLimitlessTest extends LineaPluginTestBasePrague {
3333
private static final BigInteger GAS_LIMIT = DefaultGasProvider.GAS_LIMIT;
3434
private static final BigInteger GAS_PRICE = DefaultGasProvider.GAS_PRICE;
3535

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/ExcludedPrecompilesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
import org.web3j.tx.gas.DefaultGasProvider;
3030
import org.web3j.utils.Numeric;
3131

32-
public class ExcludedPrecompilesTest extends LineaPluginPoSTestBase {
32+
public class ExcludedPrecompilesTest extends LineaPluginTestBasePrague {
3333
private static final BigInteger GAS_LIMIT = DefaultGasProvider.GAS_LIMIT;
3434
private static final BigInteger GAS_PRICE = DefaultGasProvider.GAS_PRICE;
3535

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
// This file initializes a Besu node configured for the Prague fork and makes it available to
7474
// acceptance tests.
7575
@Slf4j
76-
public abstract class LineaPluginPoSTestBase extends LineaPluginTestBase {
76+
public abstract class LineaPluginTestBasePrague extends LineaPluginTestBase {
7777
private EngineAPIService engineApiService;
7878
protected ObjectMapper mapper;
7979

@@ -89,7 +89,7 @@ public abstract class LineaPluginPoSTestBase extends LineaPluginTestBase {
8989

9090
// Override this in subclasses to use a different genesis file template
9191
protected String getGenesisFileTemplatePath() {
92-
return "/clique/clique-to-pos.json.tpl";
92+
return "/clique/clique-prague-no-blobs.json.tpl";
9393
}
9494

9595
@BeforeEach

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/ModExpLimitsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.web3j.protocol.core.methods.response.EthSendTransaction;
2525
import org.web3j.utils.Numeric;
2626

27-
public class ModExpLimitsTest extends LineaPluginPoSTestBase {
27+
public class ModExpLimitsTest extends LineaPluginTestBasePrague {
2828

2929
@Override
3030
public List<String> getTestCliOptions() {

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/ProfitableTransactionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.web3j.tx.RawTransactionManager;
2323
import org.web3j.tx.TransactionManager;
2424

25-
public class ProfitableTransactionTest extends LineaPluginPoSTestBase {
25+
public class ProfitableTransactionTest extends LineaPluginTestBasePrague {
2626
private static final double MIN_MARGIN = 1.5;
2727
private static final Wei MIN_GAS_PRICE = Wei.of(1_000_000_000);
2828

besu-plugins/linea-sequencer/acceptance-tests/src/test/java/linea/plugin/acc/test/TransactionCallDataSizeLimitTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.web3j.tx.TransactionManager;
2525
import org.web3j.tx.gas.DefaultGasProvider;
2626

27-
public class TransactionCallDataSizeLimitTest extends LineaPluginPoSTestBase {
27+
public class TransactionCallDataSizeLimitTest extends LineaPluginTestBasePrague {
2828

2929
public static final int MAX_CALLDATA_SIZE = 1188; // contract has a call data size of 1160
3030
private static final BigInteger GAS_PRICE = DefaultGasProvider.GAS_PRICE;

0 commit comments

Comments
 (0)