Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions espresso/enclave-tests/enclave_smoke_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
env "github.com/ethereum-optimism/optimism/espresso/environment"
)

// TestE2eDevNetWithEspressoAndEnclaveSimpleTransactions launches the e2e Dev Net with the Espresso
// TestE2eDevnetWithEspressoAndEnclaveSimpleTransactions launches the e2e Dev Net with the Espresso
// Dev Node in Enclave and runs a couple of simple transactions to it.
func TestE2eDevNetWithEspressoAndEnclaveSimpleTransactions(t *testing.T) {
func TestE2eDevnetWithEspressoAndEnclaveSimpleTransactions(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand All @@ -29,7 +29,7 @@ func TestE2eDevNetWithEspressoAndEnclaveSimpleTransactions(t *testing.T) {
launcher := new(env.EspressoDevNodeLauncherDocker)
launcher.EnclaveBatcher = true

system, espressoDevNode, err := launcher.StartDevNet(ctx, t)
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t)
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
}
Expand Down
4 changes: 2 additions & 2 deletions espresso/environment/10_soft_confirmation_integrity_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ func TestSequencerFeedConsistency(t *testing.T) {
defer cancel()

launcher := new(env.EspressoDevNodeLauncherDocker)
system, espressoDevNode, err := launcher.StartDevNet(ctx, t, env.WithL1FinalizedDistance(0))
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, env.WithL1FinalizedDistance(0))

// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
Expand Down Expand Up @@ -584,7 +584,7 @@ func TestSequencerFeedConsistencyWithAttackOnEspresso(t *testing.T) {
defer cancel()

launcher := new(env.EspressoDevNodeLauncherDocker)
system, espressoDevNode, err := launcher.StartDevNet(ctx, t, env.WithL1FinalizedDistance(0))
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, env.WithL1FinalizedDistance(0))

// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
Expand Down
2 changes: 1 addition & 1 deletion espresso/environment/11_forced_transaction_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func ForcedTransaction(t *testing.T, withSmallSequencerWindow bool, withEspresso
var err error
if withEspresso {
launcher := new(env.EspressoDevNodeLauncherDocker)
systemWithEspresso, espressoDevNode, err := launcher.StartDevNet(ctx, t, env.WithSequencerWindowSize(sequencer_window_size(withSmallSequencerWindow)))
systemWithEspresso, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, env.WithSequencerWindowSize(sequencer_window_size(withSmallSequencerWindow)))
system = systemWithEspresso
require.NoError(t, err, "Failed to launch with the Espresso dev node")
defer env.Stop(t, system)
Expand Down
2 changes: 1 addition & 1 deletion espresso/environment/12_enforce_majority_rule_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func runWithMultiClient(t *testing.T, numGoodUrls int, numBadUrls int, expectedE

launcher := new(env.EspressoDevNodeLauncherDocker)

system, devNode, err := launcher.StartDevNet(ctx, t, env.SetEspressoUrls(numGoodUrls, numBadUrls, badServerUrl))
system, devNode, err := launcher.StartE2eDevnet(ctx, t, env.SetEspressoUrls(numGoodUrls, numBadUrls, badServerUrl))
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
}
Expand Down
2 changes: 1 addition & 1 deletion espresso/environment/13_dispute_game_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func TestOutputAlphabetGameWithEspresso_ChallengerWins(t *testing.T) {
launcher := new(env.EspressoDevNodeLauncherDocker)

// Start a Fault Dispute System with Espresso Dev Node
sys, espressoDevNode, err := launcher.StartDevNetWithFaultDisputeSystem(ctx, t, env.WithL1FinalizedDistance(0), env.WithSequencerUseFinalized(true))
sys, espressoDevNode, err := launcher.StartE2eDevnetWithFaultDisputeSystem(ctx, t, env.WithL1FinalizedDistance(0), env.WithSequencerUseFinalized(true))

l1Client := sys.NodeClient("l1")

Expand Down
6 changes: 3 additions & 3 deletions espresso/environment/1_espresso_benchmark_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
geth_types "github.com/ethereum/go-ethereum/core/types"
)

// TestE2eDevNetWithEspressoFastConfirmationStability is a test that tests
// TestE2eDevnetWithEspressoFastConfirmationStability is a test that tests
// the benchmarking setup of the Espresso Caff Node's performance versus the
// L2 Verifier derived from the L1.
//
Expand Down Expand Up @@ -44,12 +44,12 @@ import (
//
// For the purposes of this test the "reasonable" value is defined to
// be 2 seconds.
func TestE2eDevNetWithEspressoFastConfirmationStability(t *testing.T) {
func TestE2eDevnetWithEspressoFastConfirmationStability(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()

launcher := new(env.EspressoDevNodeLauncherDocker)
system, espressoDevNode, err := launcher.StartDevNet(
system, espressoDevNode, err := launcher.StartE2eDevnet(
ctx,
t,
env.WithSequencerUseFinalized(true),
Expand Down
12 changes: 6 additions & 6 deletions espresso/environment/2_espresso_liveness_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/stretchr/testify/require"
)

// TestE2eDevNetWithEspressoEspressoDegradedLiveness is a test that checks that
// TestE2eDevnetWithEspressoDegradedLiveness is a test that checks that
// the rollup will continue to make progress even in the event of intermittent
// Espresso system failures.
//
Expand Down Expand Up @@ -57,7 +57,7 @@ import (
// Likewise, we might be able to simulate 3 by falsely reporting to the
// submitter that the transaction was submitted successfully, and withholding
// the submission itself.
func TestE2eDevNetWithEspressoEspressoDegradedLiveness(t *testing.T) {
func TestE2eDevnetWithEspressoDegradedLiveness(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand All @@ -79,7 +79,7 @@ func TestE2eDevNetWithEspressoEspressoDegradedLiveness(t *testing.T) {
)

defer server.Close()
system, espressoDevNode, err := launcher.StartDevNet(ctx, t, option)
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, option)

// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
Expand Down Expand Up @@ -139,7 +139,7 @@ func TestE2eDevNetWithEspressoEspressoDegradedLiveness(t *testing.T) {
}
}

// TestE2eDevNetWithEspressoEspressoDegradedLivenessViaCaffNode is a test that
// TestE2eDevnetWithEspressoDegradedLivenessViaCaffNode is a test that
// checks that Espresso will return fast confirmations even when in a
// degraded state.
//
Expand All @@ -165,7 +165,7 @@ func TestE2eDevNetWithEspressoEspressoDegradedLiveness(t *testing.T) {
// a Transaction, we should be able to find the receipt on the L2, and then
// we can use that Block information to track the arrival of the Transaction
// / Block coming from Espresso.
func TestE2eDevNetWithEspressoEspressoDegradedLivenessViaCaffNode(t *testing.T) {
func TestE2eDevnetWithEspressoDegradedLivenessViaCaffNode(t *testing.T) {
ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
defer cancel()

Expand All @@ -185,7 +185,7 @@ func TestE2eDevNetWithEspressoEspressoDegradedLivenessViaCaffNode(t *testing.T)
)

defer env.Stop(t, server)
system, espressoDevNode, err := launcher.StartDevNet(
system, espressoDevNode, err := launcher.StartE2eDevnet(
ctx,
t,
option,
Expand Down
6 changes: 3 additions & 3 deletions espresso/environment/3_1_espresso_caff_node_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"github.com/ethereum/go-ethereum/accounts/abi/bind"
)

// TestE2eDevNetWithEspressoWithCaffNodeDeterministicDerivation is a test that
// TestE2eDevnetWithEspressoWithCaffNodeDeterministicDerivation is a test that
// attempts to make sure that the caff node can derive the same state as the
// original op-node (non caffeinated).
//
Expand All @@ -31,13 +31,13 @@ import (
//
// The actual tests is unable to make Alice's initial balance zero, and will
// instead just check Alice's starting balance against the rest of the cases.
func TestE2eDevNetWithEspressoWithCaffNodeDeterministicDerivation(t *testing.T) {
func TestE2eDevnetWithEspressoWithCaffNodeDeterministicDerivation(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

launcher := new(env.EspressoDevNodeLauncherDocker)

system, espressoDevNode, err := launcher.StartDevNet(ctx, t)
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t)
// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
Expand Down
6 changes: 3 additions & 3 deletions espresso/environment/3_2_espresso_deterministic_state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func TestDeterministicDerivationExecutionStateWithInvalidTransaction(t *testing.
launcher := new(env.EspressoDevNodeLauncherDocker)

// Start the devnet with the sequencer using finalized blocks
system, espressoDevNode, err := launcher.StartDevNet(ctx, t, env.WithL1FinalizedDistance(0), env.WithSequencerUseFinalized(true))
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, env.WithL1FinalizedDistance(0), env.WithSequencerUseFinalized(true))
// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
Expand Down Expand Up @@ -264,8 +264,8 @@ func TestValidEspressoTransactionCreation(t *testing.T) {

launcher := new(env.EspressoDevNodeLauncherDocker)

// once this StartDevNet returns, we have a running Espresso Dev Node
system, espressoDevNode, err := launcher.StartDevNet(ctx, t)
// once this StartE2eDevnet returns, we have a running Espresso Dev Node
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t)
// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func TestFastDerivationAndCaffNode(t *testing.T) {

launcher := new(env.EspressoDevNodeLauncherDocker)

system, espressoDevNode, err := launcher.StartDevNet(ctx, t, env.WithL1FinalizedDistance(0), env.WithSequencerUseFinalized(true))
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, env.WithL1FinalizedDistance(0), env.WithSequencerUseFinalized(true))

// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ func TestConfirmationIntegrityWithReorgs(t *testing.T) {

launcher := new(env.EspressoDevNodeLauncherDocker)

system, _, err := launcher.StartDevNet(ctx, t)
system, _, err := launcher.StartE2eDevnet(ctx, t)
require.NoError(t, err, "failed to start dev environment with espresso dev node")

run(ctx, t, system)
Expand Down
12 changes: 6 additions & 6 deletions espresso/environment/5_batch_authentication_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ import (
"github.com/hf/nitrite"
)

// TestE2eDevNetWithInvalidAttestation verifies that the batcher correctly fails to register
// TestE2eDevnetWithInvalidAttestation verifies that the batcher correctly fails to register
// when provided with an invalid attestation. This test ensures that the batch inbox contract
// properly validates attestations
func TestE2eDevNetWithInvalidAttestation(t *testing.T) {
func TestE2eDevnetWithInvalidAttestation(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand All @@ -29,7 +29,7 @@ func TestE2eDevNetWithInvalidAttestation(t *testing.T) {
}

system, _, err :=
launcher.StartDevNet(ctx, t,
launcher.StartE2eDevnet(ctx, t,
env.SetBatcherKey(*privateKey),
env.Config(func(cfg *e2esys.SystemConfig) {
cfg.DisableBatcher = true
Expand Down Expand Up @@ -60,9 +60,9 @@ func TestE2eDevNetWithInvalidAttestation(t *testing.T) {
}
}

// TestE2eDevNetWithUnattestedBatcherKey verifies that when a batcher key is not properly
// TestE2eDevnetWithUnattestedBatcherKey verifies that when a batcher key is not properly
// attested, the L2 chain can still produce unsafe blocks but cannot progress to safe L2 blocks.
func TestE2eDevNetWithUnattestedBatcherKey(t *testing.T) {
func TestE2eDevnetWithUnattestedBatcherKey(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

Expand All @@ -74,7 +74,7 @@ func TestE2eDevNetWithUnattestedBatcherKey(t *testing.T) {
}

system, _, err :=
launcher.StartDevNet(ctx, t,
launcher.StartE2eDevnet(ctx, t,
env.SetBatcherKey(*privateKey),
)
if have, want := err, error(nil); have != want {
Expand Down
6 changes: 3 additions & 3 deletions espresso/environment/6_batch_inbox_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/stretchr/testify/require"
)

// TestE2eDevNetWithoutAuthenticatingBatches verifies BatchInboxContract behaviour when batches
// TestE2eDevnetWithoutAuthenticatingBatches verifies BatchInboxContract behaviour when batches
// aren't attested before being posted to batch inbox. To do this, we substitute BatchAuthenticatorAddress
// in batcher config with a zero address, which will never revert as it has no contract deployed.
// This way we trick batcher into posting unauthenticated batches to batch inbox.
Expand All @@ -37,14 +37,14 @@ import (
// Assert that transaction submitting the batch was reverted by
// batch inbox contract
// Assert that derivation pipeline doesn't progress
func TestE2eDevNetWithoutAuthenticatingBatches(t *testing.T) {
func TestE2eDevnetWithoutAuthenticatingBatches(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

launcher := new(env.EspressoDevNodeLauncherDocker)

system, _, err :=
launcher.StartDevNet(ctx, t,
launcher.StartE2eDevnet(ctx, t,
env.Config(func(cfg *e2esys.SystemConfig) {
cfg.DisableBatcher = true
}),
Expand Down
2 changes: 1 addition & 1 deletion espresso/environment/7_stateless_batcher_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ func TestStatelessBatcher(t *testing.T) {

launcher := new(env.EspressoDevNodeLauncherDocker)

system, espressoDevNode, err := launcher.StartDevNet(ctx, t)
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t)
// Signal the testnet to shut down
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
Expand Down
10 changes: 5 additions & 5 deletions espresso/environment/8_reorg_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ func TestBatcherWaitForFinality(t *testing.T) {

// Set NonFinalizedProposals to true and SequencerUseFinalized to false, to make sure we are
// testing how the batcher handles the finality.
system, espressoDevNode, err := launcher.StartDevNet(ctx, t, env.WithL1FinalizedDistance(4), env.WithNonFinalizedProposals(true), env.WithSequencerUseFinalized(false))
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, env.WithL1FinalizedDistance(4), env.WithNonFinalizedProposals(true), env.WithSequencerUseFinalized(false))
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
}
Expand Down Expand Up @@ -139,7 +139,7 @@ func TestCaffNodeWaitForFinality(t *testing.T) {

// Set L1FinalizedDistance to nonzero, NonFinalizedProposals to true, and SequencerUseFinalized
// to false, to make sure we are testing how the Caff node handles the finality.
system, espressoDevNode, err := launcher.StartDevNet(ctx, t, env.WithL1FinalizedDistance(4), env.WithNonFinalizedProposals(true), env.WithSequencerUseFinalized(false))
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t, env.WithL1FinalizedDistance(4), env.WithNonFinalizedProposals(true), env.WithSequencerUseFinalized(false))
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
}
Expand Down Expand Up @@ -244,7 +244,7 @@ func runL1Reorg(ctx context.Context, t *testing.T, system *e2esys.System) {
require.Equal(t, caffL2Head.Hash(), newL2Head.Hash())
}

// TestE2eDevNetWithL1Reorg tests how the batcher and Caff node handle an L1 reorg.
// TestE2eDevnetWithL1Reorg tests how the batcher and Caff node handle an L1 reorg.
// Specifically, it focuses on cases where unsafe L2 chain contains blocks that
// reference unfinalized L1 blocks as their origin.
//
Expand All @@ -263,13 +263,13 @@ func runL1Reorg(ctx context.Context, t *testing.T, system *e2esys.System) {
//
// Assert that derivation pipeline still progresses
// Assert that Caff and OP node report a new block at the target L2 height
func TestE2eDevNetWithL1Reorg(t *testing.T) {
func TestE2eDevnetWithL1Reorg(t *testing.T) {
ctx, cancel := context.WithCancel(context.Background())
defer cancel()

launcher := new(env.EspressoDevNodeLauncherDocker)

system, devNode, err := launcher.StartDevNet(ctx, t, env.WithL1FinalizedDistance(16))
system, devNode, err := launcher.StartE2eDevnet(ctx, t, env.WithL1FinalizedDistance(16))
if have, want := err, error(nil); have != want {
t.Fatalf("failed to start dev environment with espresso dev node:\nhave:\n\t\"%v\"\nwant:\n\t\"%v\"\n", have, want)
}
Expand Down
2 changes: 1 addition & 1 deletion espresso/environment/9_pipeline_enhancement_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func TestPipelineEnhancement(t *testing.T) {

launcher := new(env.EspressoDevNodeLauncherDocker)

system, espressoDevNode, err := launcher.StartDevNet(ctx, t)
system, espressoDevNode, err := launcher.StartE2eDevnet(ctx, t)
require.NoError(t, err, "failed to start dev environment with espresso dev node")

// Stop the batcher to ensure no valid batch is posted to L1.
Expand Down
Loading