op-e2e: Retrieve AllocType from System instead of env

.circleci/config.yml

@@ -908,9 +908,6 @@ jobs:
 
  go-e2e-test:
  parameters:
- variant:
- type: string
- default: ''
  module:
  description: Go Module Name
  type: string
@@ -935,13 +932,6 @@ jobs:
  parallelism: <<parameters.parallelism>>
  steps:
  - checkout
- - when:
- condition:
- equal: ['-mt-cannon', <<parameters.variant>>]
- steps:
- - run:
- name: Set OP_E2E_ALLOC_TYPE = mt-cannon
- command: echo 'export OP_E2E_ALLOC_TYPE=mt-cannon' >> $BASH_ENV
  - check-changed:
  patterns: op-(.+),cannon,contracts-bedrock
  - run:
@@ -979,7 +969,7 @@ jobs:
  # want it to.
  export OP_E2E_CANNON_ENABLED="false"
  # Note: We don't use circle CI test splits because we need to split by test name, not by package. There is an additional
- # constraint that gotestsum does not currently (nor likely will) accept files from different pacakges when building.
+ # constraint that gotestsum does not currently (nor likely will) accept files from different packages when building.
  JUNIT_FILE=/tmp/test-results/<<parameters.module>>_<<parameters.target>>.xml JSON_LOG_FILE=/testlogs/test.log make <<parameters.target>>
  working_directory: <<parameters.module>>
  - store_artifacts:
@@ -1685,13 +1675,10 @@ workflows:
  context:
  - slack
  - go-e2e-test:
- name: op-e2e-cannon-tests<< matrix.variant >>
- matrix:
- parameters:
- variant: ["", "-mt-cannon"]
+ name: op-e2e-cannon-tests
  module: op-e2e
  target: test-cannon
- parallelism: 4
+ parallelism: 8
  notify: true
  mentions: "@proofs-squad"
  requires:

op-e2e/config/init.go

@@ -212,15 +212,3 @@ func initAllocType(root string, allocType AllocType) {
  dc.SetDeployments(l1Deployments)
  deployConfigsByType[allocType] = dc
 }
-
-func AllocTypeFromEnv() AllocType {
- allocType := os.Getenv("OP_E2E_ALLOC_TYPE")
- if allocType == "" {
- return DefaultAllocType
- }
- out := AllocType(allocType)
- if err := out.Check(); err != nil {
- panic(err)
- }
- return out
-}

op-e2e/e2eutils/challenger/helper.go

@@ -12,7 +12,6 @@ import (
  "time"
 
  e2econfig "github.com/ethereum-optimism/optimism/op-e2e/config"
-
  "github.com/ethereum-optimism/optimism/op-service/crypto"
 
  "github.com/ethereum/go-ethereum/ethclient"
@@ -39,6 +38,11 @@ type EndpointProvider interface {
  L1BeaconEndpoint() endpoint.RestHTTP
 }
 
+type System interface {
+ RollupCfg() *rollup.Config
+ L2Genesis() *core.Genesis
+ AllocType() e2econfig.AllocType
+}
 type Helper struct {
  log log.Logger
  t *testing.T
@@ -142,17 +146,17 @@ func applyCannonConfig(c *config.Config, t *testing.T, rollupCfg *rollup.Config,
  c.Cannon.RollupConfigPath = rollupFile
 }
 
-func WithCannon(t *testing.T, rollupCfg *rollup.Config, l2Genesis *core.Genesis, allocType e2econfig.AllocType) Option {
+func WithCannon(t *testing.T, system System) Option {
  return func(c *config.Config) {
  c.TraceTypes = append(c.TraceTypes, types.TraceTypeCannon)
- applyCannonConfig(c, t, rollupCfg, l2Genesis, allocType)
+ applyCannonConfig(c, t, system.RollupCfg(), system.L2Genesis(), system.AllocType())
  }
 }
 
-func WithPermissioned(t *testing.T, rollupCfg *rollup.Config, l2Genesis *core.Genesis, allocType e2econfig.AllocType) Option {
+func WithPermissioned(t *testing.T, system System) Option {
  return func(c *config.Config) {
  c.TraceTypes = append(c.TraceTypes, types.TraceTypePermissioned)
- applyCannonConfig(c, t, rollupCfg, l2Genesis, allocType)
+ applyCannonConfig(c, t, system.RollupCfg(), system.L2Genesis(), system.AllocType())
  }
 }
 

op-e2e/e2eutils/disputegame/helper.go

@@ -83,6 +83,7 @@ type DisputeSystem interface {
  L1Deployments() *genesis.L1Deployments
  RollupCfg() *rollup.Config
  L2Genesis() *core.Genesis
+ AllocType() config.AllocType
 
  AdvanceTime(time.Duration)
 }
@@ -117,7 +118,7 @@ func NewFactoryHelper(t *testing.T, ctx context.Context, system DisputeSystem, o
  chainID, err := client.ChainID(ctx)
  require.NoError(err)
 
- allocType := config.AllocTypeFromEnv()
+ allocType := system.AllocType()
  require.True(allocType.UsesProofs(), "AllocType %v does not support proofs", allocType)
 
  factoryCfg := &FactoryCfg{PrivKey: TestKey}

op-e2e/e2eutils/disputegame/output_cannon_helper.go

@@ -35,7 +35,7 @@ type OutputCannonGameHelper struct {
 
 func (g *OutputCannonGameHelper) StartChallenger(ctx context.Context, name string, options ...challenger.Option) *challenger.Helper {
  opts := []challenger.Option{
- challenger.WithCannon(g.T, g.System.RollupCfg(), g.System.L2Genesis(), g.AllocType),
+ challenger.WithCannon(g.T, g.System),
  challenger.WithFactoryAddress(g.FactoryAddr),
  challenger.WithGameAddress(g.Addr),
  }
@@ -331,7 +331,7 @@ func (g *OutputCannonGameHelper) createCannonTraceProvider(ctx context.Context,
 
 func (g *OutputCannonGameHelper) defaultChallengerOptions() []challenger.Option {
  return []challenger.Option{
- challenger.WithCannon(g.T, g.System.RollupCfg(), g.System.L2Genesis(), g.AllocType),
+ challenger.WithCannon(g.T, g.System),
  challenger.WithFactoryAddress(g.FactoryAddr),
  challenger.WithGameAddress(g.Addr),
  }

op-e2e/e2eutils/disputegame/output_game_helper.go

@@ -42,7 +42,6 @@ type OutputGameHelper struct {
  Addr common.Address
  CorrectOutputProvider *outputs.OutputTraceProvider
  System DisputeSystem
- AllocType config.AllocType
 }
 
 func NewOutputGameHelper(t *testing.T, require *require.Assertions, client *ethclient.Client, opts *bind.TransactOpts, privKey *ecdsa.PrivateKey,
@@ -58,7 +57,6 @@ func NewOutputGameHelper(t *testing.T, require *require.Assertions, client *ethc
  Addr: addr,
  CorrectOutputProvider: correctOutputProvider,
  System: system,
- AllocType: allocType,
  }
 }
 

op-e2e/faultproofs/cannon_benchmark_test.go

@@ -33,12 +33,20 @@ import (
  "github.com/ethereum-optimism/optimism/op-service/testlog"
 )
 
-func TestBenchmarkCannon_FPP(t *testing.T) {
+func TestBenchmarkCannonFPP_Standard(t *testing.T) {
+ testBenchmarkCannonFPP(t, config.AllocTypeStandard)
+}
+
+func TestBenchmarkCannonFPP_Multithreaded(t *testing.T) {
+ testBenchmarkCannonFPP(t, config.AllocTypeMTCannon)
+}
+
+func testBenchmarkCannonFPP(t *testing.T, allocType config.AllocType) {
  t.Skip("TODO(client-pod#906): Compare total witness size for assertions against pages allocated by the VM")
 
  op_e2e.InitParallel(t, op_e2e.UsesCannon)
  ctx := context.Background()
- cfg := e2esys.DefaultSystemConfig(t, e2esys.WithAllocType(config.AllocTypeFromEnv()))
+ cfg := e2esys.DefaultSystemConfig(t, e2esys.WithAllocType(allocType))
  // We don't need a verifier - just the sequencer is enough
  delete(cfg.Nodes, "verifier")
  // Use a small sequencer window size to avoid test timeout while waiting for empty blocks

op-e2e/faultproofs/multi_test.go

@@ -4,8 +4,6 @@ import (
  "context"
  "testing"
 
- "github.com/ethereum-optimism/optimism/op-e2e/config"
-
  op_e2e "github.com/ethereum-optimism/optimism/op-e2e"
 
  "github.com/ethereum-optimism/optimism/op-e2e/e2eutils/challenger"
@@ -29,7 +27,7 @@ func TestMultipleGameTypes(t *testing.T) {
 
  // Start a challenger with both cannon and alphabet support
  gameFactory.StartChallenger(ctx, "TowerDefense",
- challenger.WithCannon(t, sys.RollupConfig, sys.L2GenesisCfg, config.AllocTypeFromEnv()),
+ challenger.WithCannon(t, sys),
  challenger.WithAlphabet(),
  challenger.WithPrivKey(sys.Cfg.Secrets.Alice),
  )