8000 scenarios: refactor types by MariusVanDerWijden · Pull Request #60 · ethpandaops/spamoor · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

scenarios: refactor types #60

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

Merged
merged 1 commit into from
Jun 17, 2025
Merged

scenarios: refactor types #60

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
14 changes: 7 additions & 7 deletions cmd/spamoor/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/scenarios"
"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/utils"
)
Expand Down Expand Up @@ -59,7 +59,7 @@ func main() {
// load scenario
invalidScenario := false
var scenarioName string
var scenarioDescriptior *scenariotypes.ScenarioDescriptor
var scenarioDescriptior *scenario.Descriptor
if flags.NArg() < 2 {
invalidScenario = true
} else {
Expand All @@ -82,13 +82,13 @@ func main() {
return
}

scenario := scenarioDescr 10000 iptior.NewScenario(logger)
if scenario == nil {
newScenario := scenarioDescriptior.NewScenario(logger)
if newScenario == nil {
panic("could not create scenario instance")
}

flags.Init(fmt.Sprintf("%v %v", flags.Args()[0], scenarioName), pflag.ExitOnError)
scenario.Flags(flags)
newScenario.Flags(flags)
cliArgs.rpchosts = nil
flags.Parse(os.Args)

Expand Down Expand Up @@ -151,7 +151,7 @@ func main() {
walletPool.SetWalletSeed(cliArgs.seed)

// init scenario
err = scenario.Init(&scenariotypes.ScenarioOptions{
err = newScenario.Init(&scenario.Options{
WalletPool: walletPool,
})
if err != nil {
Expand All @@ -165,7 +165,7 @@ func main() {
}

// start scenario
err = scenario.Run(ctx)
err = newScenario.Run(ctx)
if err != nil {
panic(err)
}
Expand Down
4 changes: 2 additions & 2 deletions daemon/export_import.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import (
"path/filepath"
"strings"

"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/scenarios"
"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/spamoor"
"gopkg.in/yaml.v3"
)
Expand Down Expand Up @@ -368,7 +368,7 @@ func (d *Daemon) spammerExistsByScenarioAndName(scenario, name string) bool {
}

// mergeConfiguration merges scenario defaults with imported configuration
func (d *Daemon) mergeConfiguration(scenario *scenariotypes.ScenarioDescriptor, importedConfig map[string]interface{}) (string, error) {
func (d *Daemon) mergeConfiguration(scenario *scenario.Descriptor, importedConfig map[string]interface{}) (string, error) {
// Get default configurations
defaultYaml, err := yaml.Marshal(scenario.DefaultOptions)
if err != nil {
Expand Down
6 changes: 3 additions & 3 deletions daemon/spammer.go
8000
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (

"github.com/ethpandaops/spamoor/daemon/db"
"github.com/ethpandaops/spamoor/daemon/logscope"
"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/scenarios"
"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/holiman/uint256"
"github.com/jmoiron/sqlx"
Expand Down Expand Up @@ -252,14 +252,14 @@ func (s *Spammer) runScenario() {

s.walletPool = spamoor.NewWalletPool(s.scenarioCtx, s.logger, s.daemon.rootWallet, s.daemon.clientPool, s.daemon.txpool)
s.walletPool.SetTransactionTracker(s.TrackTransactionResult)
scenarioOptions := &scenariotypes.ScenarioOptions{
options := &scenario.Options{
WalletPool: s.walletPool,
Config: s.dbEntity.Config,
GlobalCfg: s.daemon.GetGlobalCfg(),
}
scenario := scenarioDescriptor.NewScenario(s.logger)

err := scenario.Init(scenarioOptions)
err := scenario.Init(options)
if err != nil {
scenarioErr = fmt.Errorf("failed to init scenario: %w", err)
return
Expand Down
16 changes: 8 additions & 8 deletions scenariotypes/scenario.go → scenario/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package scenariotypes
package scenario

import (
"context"
Expand All @@ -8,26 +8,26 @@ import (
"github.com/spf13/pflag"
)

// ScenarioDescriptor describes a scenario.
type ScenarioDescriptor struct {
// Descriptor describes a scenario.
type Descriptor struct {
Name string
Description string
DefaultOptions interface{}
DefaultOptions any
NewScenario func(logger logrus.FieldLogger) Scenario
}

// ScenarioOptions contains the options for the scenario initialization.
type ScenarioOptions struct {
// Options contains the options for the scenario initialization.
type Options struct {
WalletPool *spamoor.WalletPool
Config string
GlobalCfg m 9E81 ap[string]interface{}
GlobalCfg map[string]any
}

type Scenario interface {
// Flags registers the scenario's flags with the given flag set.
Flags(flags *pflag.FlagSet) error
// Init initializes the scenario with the given options.
Init(options *ScenarioOptions) error
Init(options *Options) error
// Run runs the scenario.
Run(ctx context.Context) error
}
8 changes: 4 additions & 4 deletions scenarios/blob-combined/blob_combined.go
View file
Open in desktop
F438
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/txbuilder"
"github.com/ethpandaops/spamoor/utils"
Expand Down Expand Up @@ -69,14 +69,14 @@ var ScenarioDefaultOptions = ScenarioOptions{
Timeout: "",
ClientGroup: "",
}
var ScenarioDescriptor = scenariotypes.ScenarioDescriptor{
var ScenarioDescriptor = scenario.Descriptor{
Name: ScenarioName,
Description: "Send blob transactions with different configurations",
DefaultOptions: ScenarioDefaultOptions,
NewScenario: newScenario,
}

func newScenario(logger logrus.FieldLogger) scenariotypes.Scenario {
func newScenario(logger logrus.FieldLogger) scenario.Scenario {
return &Scenario{
options: ScenarioDefaultOptions,
logger: logger.WithField("scenario", ScenarioName),
Expand All @@ -103,7 +103,7 @@ func (s *Scenario) Flags(flags *pflag.FlagSet) error {
return nil
}

func (s *Scenario) Init(options *scenariotypes.ScenarioOptions) error {
func (s *Scenario) Init(options *scenario.Options) error {
s.walletPool = options.WalletPool

if options.Config != "" {
Expand Down
8 changes: 4 additions & 4 deletions scenarios/blob-conflicting/blob_conflicting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/txbuilder"
"github.com/ethpandaops/spamoor/utils"
Expand Down Expand Up @@ -65,14 +65,14 @@ var ScenarioDefaultOptions = ScenarioOptions{
Timeout: "",
ClientGroup: "",
}
var ScenarioDescriptor = scenariotypes.ScenarioDescriptor{
var ScenarioDescriptor = scenario.Descriptor{
Name: ScenarioName,
Description: "Send conflicting blob transactions",
DefaultOptions: ScenarioDefaultOptions,
NewScenario: newScenario,
}

func newScenario(logger logrus.FieldLogger) scenariotypes.Scenario {
func newScenario(logger logrus.FieldLogger) scenario.Scenario {
return &Scenario{
options: ScenarioDefaultOptions,
logger: logger.WithField("scenario", ScenarioName),
Expand All @@ -97,7 +97,7 @@ func (s *Scenario) Flags(flags *pflag.FlagSet) error {
return nil
}

func (s *Scenario) Init(options *scenariotypes.ScenarioOptions) error {
func (s *Scenario) Init(options *scenario.Options) error {
s.walletPool = options.WalletPool

if options.Config != "" {
Expand Down
8 changes: 4 additions & 4 deletions scenarios/blob-replacements/blob_replacements.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/txbuilder"
"github.com/ethpandaops/spamoor/utils"
Expand Down Expand Up @@ -69,14 +69,14 @@ var ScenarioDefaultOptions = ScenarioOptions{
Timeout: "",
ClientGroup: "",
}
var ScenarioDescriptor = scenariotypes.ScenarioDescriptor{
var ScenarioDescriptor = scenario.Descriptor{
Name: ScenarioName,
Description: "Send blob transactions with replacements",
DefaultOptions: ScenarioDefaultOptions,
NewScenario: newScenario,
}

func newScenario(logger logrus.FieldLogger) scenariotypes.Scenario {
func newScenario(logger logrus.FieldLogger) scenario.Scenario {
return &Scenario{
options: ScenarioDefaultOptions,
logger: logger.WithField("scenario", ScenarioName),
Expand All @@ -103,7 +103,7 @@ func (s *Scenario) Flags(flags *pflag.FlagSet) error {
return nil
}

func (s *Scenario) Init(options *scenariotypes.ScenarioOptions) error {
func (s *Scenario) Init(options *scenario.Options) error {
s.walletPool = options.WalletPool

if options.Config != "" {
Expand Down
8 changes: 4 additions & 4 deletions scenarios/blobs/blobs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/txbuilder"
"github.com/ethpandaops/spamoor/utils"
Expand Down Expand Up @@ -65,14 +65,14 @@ var ScenarioDefaultOptions = ScenarioOptions{
Timeout: "",
ClientGroup: "",
}
var ScenarioDescriptor = scenariotypes.ScenarioDescriptor{
var ScenarioDescriptor = scenario.Descriptor{
Name: ScenarioName,
Description: "Send simple blob transactions",
DefaultOptions: ScenarioDefaultOptions,
NewScenario: newScenario,
}

func newScenario(logger logrus.FieldLogger) scenariotypes.Scenario {
func newScenario(logger logrus.FieldLogger) scenario.Scenario {
return &Scenario{
options: ScenarioDefaultOptions,
logger: logger.WithField("scenario", ScenarioName),
Expand All @@ -97,7 +97,7 @@ func (s *Scenario) Flags(flags *pflag.FlagSet) error {
return nil
}

func (s *Scenario) Init(options *scenariotypes.ScenarioOptions) error {
func (s *Scenario) Init(options *scenario.Options) error {
s.walletPool = options.WalletPool

if options.Config != "" {
Expand Down
8 changes: 4 additions & 4 deletions scenarios/calltx/calltx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/txbuilder"
"github.com/ethpandaops/spamoor/utils"
Expand Down Expand Up @@ -95,14 +95,14 @@ var ScenarioDefaultOptions = ScenarioOptions{
Timeout: "",
ClientGroup: "",
}
var ScenarioDescriptor = scenariotypes.ScenarioDescriptor{
var ScenarioDescriptor = scenario.Descriptor{
Name: ScenarioName,
Description: "Deploy a contract and repeatedly call a function on it",
DefaultOptions: ScenarioDefaultOptions,
NewScenario: newScenario,
}

func newScenario(logger logrus.FieldLogger) scenariotypes.Scenario {
func newScenario(logger logrus.FieldLogger) scenario.Scenario {
return &Scenario{
options: ScenarioDefaultOptions,
logger: logger.WithField("scenario", ScenarioName),
Expand Down Expand Up @@ -138,7 +138,7 @@ func (s *Scenario) Flags(flags *pflag.FlagSet) error {
return nil
}

func (s *Scenario) Init(options *scenariotypes.ScenarioOptions) error {
func (s *Scenario) Init(options *scenario.Options) error {
s.walletPool = options.WalletPool

if options.Config != "" {
Expand Down
8 changes: 4 additions & 4 deletions scenarios/deploy-destruct/deploy_destruct.go
F438
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/scenarios/deploy-destruct/contract"
"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/txbuilder"
"github.com/ethpandaops/spamoor/utils"
Expand Down Expand Up @@ -64,14 +64,14 @@ var ScenarioDefaultOptions = ScenarioOptions{
Timeout: "",
ClientGroup: "",
}
var ScenarioDescriptor = scenariotypes.ScenarioDescriptor{
var ScenarioDescriptor = scenario.Descriptor{
Name: ScenarioName,
Description: "Send deploy and destruct transactions",
DefaultOptions: ScenarioDefaultOptions,
NewScenario: newScenario,
}

func newScenario(logger logrus.FieldLogger) scenariotypes.Scenario {
func newScenario(logger logrus.FieldLogger) scenario.Scenario {
return &Scenario{
options: ScenarioDefaultOptions,
logger: logger.WithField("scenario", ScenarioName),
Expand All @@ -94,7 +94,7 @@ func (s *Scenario) Flags(flags *pflag.FlagSet) error {
return nil
}

func (s *Scenario) Init(options *scenariotypes.ScenarioOptions) error {
func (s *Scenario) Init(options *scenario.Options) error {
s.walletPool = options.WalletPool

if options.Config != "" {
Expand Down
8 changes: 4 additions & 4 deletions scenarios/deploytx/deploytx.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/spf13/pflag"

"github.com/ethpandaops/spamoor/scenariotypes"
"github.com/ethpandaops/spamoor/scenario"
"github.com/ethpandaops/spamoor/spamoor"
"github.com/ethpandaops/spamoor/txbuilder"
"github.com/ethpandaops/spamoor/utils"
Expand Down Expand Up @@ -65,14 +65,14 @@ var ScenarioDefaultOptions = ScenarioOptions{
Timeout: "",
ClientGroup: "",
}
var ScenarioDescriptor = scenariotypes.ScenarioDescriptor{
var ScenarioDescriptor = scenario.Descriptor{
Name: ScenarioName,
Description: "Send deploy transactions",
DefaultOptions: ScenarioDefaultOptions,
NewScenario: newScenario,
}

func newScenario(logger logrus.FieldLogger) scenariotypes.Scenario {
func newScenario(logger logrus.FieldLogger) scenario.Scenario {
return &Scenario{
options: ScenarioDefaultOptions,
logger: logger.WithField("scenario", ScenarioName),
Expand All @@ -95,7 +95,7 @@ func (s *Scenario) Flags(flags *pflag.FlagSet) error {
return nil
}

func (s *Scenario) Init(options *scenariotypes.ScenarioOptions) error {
func (s *Scenario) Init(options *scenario.Options) error {
s.walletPool = options.WalletPool

if options.Config != "" {
Expand Down
Loading
0