Skip to content

Commit

Permalink
revert simulator changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@eserilev
eserilev committed Apr 27, 2024
1 parent c6b9712 commit 6a81d12
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 127 deletions.
121 changes: 2 additions & 119 deletions testing/simulator/src/cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,123 +6,7 @@ pub fn cli_app() -> Command {
.author("Sigma Prime <contact@sigmaprime.io>")
.about("Options for interacting with simulator")
.subcommand(
Command::new("eth1-sim")
.about(
"Lighthouse Beacon Chain Simulator creates `n` beacon node and validator clients, \
each with `v` validators. A deposit contract is deployed at the start of the \
simulation using a local `anvil` instance (you must have `anvil` \
installed and avaliable on your path). All beacon nodes independently listen \
for genesis from the deposit contract, then start operating. \
\
As the simulation runs, there are checks made to ensure that all components \
are running correctly. If any of these checks fail, the simulation will \
exit immediately.",
)
.arg(Arg::new("nodes")
.short('n')
.long("nodes")
.action(ArgAction::Set)
.default_value("4")
.help("Number of beacon nodes"))
.arg(Arg::new("proposer-nodes")
.short('p')
.long("proposer_nodes")
.action(ArgAction::Set)
.default_value("2")
.help("Number of proposer-only beacon nodes"))
.arg(Arg::new("validators_per_node")
.short('v')
.long("validators_per_node")
.action(ArgAction::Set)
.default_value("20")
.help("Number of validators"))
.arg(Arg::new("speed_up_factor")
.short('s')
.long("speed_up_factor")
.action(ArgAction::Set)
.default_value("3")
.help("Speed up factor. Please use a divisor of 12."))
.arg(Arg::new("post-merge")
.short('m')
.long("post-merge")
.action(ArgAction::SetTrue)
.help("Simulate the merge transition"))
.arg(Arg::new("continue_after_checks")
.short('c')
.long("continue_after_checks")
.action(ArgAction::SetTrue)
.help("Continue after checks (default false)"))
)
.subcommand(
Command::new("no-eth1-sim")
.about("Runs a simulator that bypasses the eth1 chain. Useful for faster testing of
components that don't rely upon eth1")
.arg(Arg::new("nodes")
.short('n')
.long("nodes")
.action(ArgAction::Set)
.default_value("4")
.help("Number of beacon nodes"))
.arg(Arg::new("proposer-nodes")
.short('p')
.long("proposer_nodes")
.action(ArgAction::Set)
.default_value("2")
.help("Number of proposer-only beacon nodes"))
.arg(Arg::new("validators_per_node")
.short('v')
.long("validators_per_node")
.action(ArgAction::Set)
.default_value("20")
.help("Number of validators"))
.arg(Arg::new("speed_up_factor")
.short('s')
.long("speed_up_factor")
.action(ArgAction::Set)
.default_value("3")
.help("Speed up factor"))
.arg(Arg::new("continue_after_checks")
.short('c')
.long("continue_after_checks")
.action(ArgAction::SetTrue)
.help("Continue after checks (default false)"))
)
.subcommand(
Command::new("syncing-sim")
.about("Run the syncing simulation")
.arg(
Arg::new("speedup")
.short('s')
.long("speedup")
.action(ArgAction::Set)
.default_value("15")
.help("Speed up factor for eth1 blocks and slot production"),
)
.arg(
Arg::new("initial_delay")
.short('i')
.long("initial_delay")
.action(ArgAction::Set)
.default_value("5")
.help("Epoch delay for new beacon node to start syncing"),
)
.arg(
Arg::new("sync_timeout")
.long("sync_timeout")
.action(ArgAction::Set)
.default_value("10")
.help("Number of epochs after which newly added beacon nodes must be synced"),
)
.arg(
Arg::new("strategy")
.long("strategy")
.action(ArgAction::Set)
.default_value("all")
.value_parser(["one-node", "two-nodes", "mixed", "all"])
.help("Sync verification strategy to run."),
)
.subcommand(
Command::new("basic-sim")
Command::new("basic-sim")
.about(
"Runs a Beacon Chain simulation with `n` beacon node and validator clients, \
each with `v` validators. \
Expand Down Expand Up @@ -237,7 +121,6 @@ pub fn cli_app() -> Command {
.long("continue_after_checks")
.action(ArgAction::Set)
.help("Continue after checks (default false)"),
)
)
),
)
}
14 changes: 6 additions & 8 deletions testing/simulator/src/fallback_sim.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ const SUGGESTED_FEE_RECIPIENT: [u8; 20] =
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1];

pub fn run_fallback_sim(matches: &ArgMatches) -> Result<(), String> {
let vc_count = matches
let vc_count = matches
.get_one::<String>("vc-count")
.unwrap()
.parse::<usize>()
.unwrap();
let validators_per_vc = matches

let validators_per_vc = matches
.get_one::<String>("validators-per-vc")
.unwrap()
.parse::<usize>()
Expand All @@ -50,17 +50,15 @@ pub fn run_fallback_sim(matches: &ArgMatches) -> Result<(), String> {
.unwrap()
.parse::<usize>()
.unwrap();

assert!(bns_per_vc > 1);
let speed_up_factor = matches
.get_one::<String>("speed-up-factor")
.unwrap()
.parse::<u64>()
.unwrap();
let log_level = matches
.get_one::<String>("debug-level")
.unwrap();

let log_level = matches.get_one::<String>("debug-level").unwrap();

let continue_after_checks = matches.get_flag("continue-after-checks");

println!("Fallback Simulator:");
Expand Down

0 comments on commit 6a81d12

Please sign in to comment.