From bdd4a8d521ff943099cbbaecdf905d5e0cdbb5cf Mon Sep 17 00:00:00 2001
From: Sergey Timoshin <sergeytimoshin@proton.me>
Date: Mon, 16 Sep 2024 19:11:14 +0700
Subject: [PATCH] Remove enable_forester config and cleanup references
---
cli/src/commands/test-validator/index.ts | 2 +-
forester/src/utils.rs | 6 ------
forester/tests/e2e_test.rs | 3 ---
forester/tests/test_utils.rs | 1 -
4 files changed, 1 insertion(+), 11 deletions(-)
diff --git a/cli/src/commands/test-validator/index.ts b/cli/src/commands/test-validator/index.ts
index fa9430563..042d52c73 100644
--- a/cli/src/commands/test-validator/index.ts
+++ b/cli/src/commands/test-validator/index.ts
@@ -77,7 +77,7 @@ class SetupCommand extends Command {
}),
stop: Flags.boolean({
description:
- "Stops the test validator and dependent processes. Use with --skip-indexer, --skip-prover, --skip-forester to keep specific services running.",
+ "Stops the test validator and dependent processes. Use with --skip-indexer, --skip-prover to keep specific services running.",
required: false,
default: false,
}),
diff --git a/forester/src/utils.rs b/forester/src/utils.rs
index 0f77604af..faa0ffd24 100644
--- a/forester/src/utils.rs
+++ b/forester/src/utils.rs
@@ -11,7 +11,6 @@ pub struct LightValidatorConfig {
pub path: String,
pub enable_indexer: bool,
pub enable_prover: bool,
- pub enable_forester: bool,
pub wait_time: u64,
}
@@ -21,7 +20,6 @@ impl Default for LightValidatorConfig {
path: "../cli/test_bin/run test-validator".to_string(),
enable_indexer: false,
enable_prover: false,
- enable_forester: false,
wait_time: 35,
}
}
@@ -37,10 +35,6 @@ pub async fn spawn_validator(config: LightValidatorConfig) {
if !config.enable_prover {
path.push_str(" --skip-prover");
}
- if !config.enable_forester {
- path.push_str(" --skip-forester");
- }
-
debug!("Starting validator with command: {}", path);
Command::new("sh")
diff --git a/forester/tests/e2e_test.rs b/forester/tests/e2e_test.rs
index 28b1e1e76..2e0190eca 100644
--- a/forester/tests/e2e_test.rs
+++ b/forester/tests/e2e_test.rs
@@ -33,7 +33,6 @@ async fn test_epoch_monitor_with_test_indexer_and_1_forester() {
init(Some(LightValidatorConfig {
enable_indexer: false,
enable_prover: true,
- enable_forester: false,
wait_time: 10,
..LightValidatorConfig::default()
}))
@@ -246,7 +245,6 @@ async fn test_epoch_monitor_with_2_foresters() {
init(Some(LightValidatorConfig {
enable_indexer: false,
enable_prover: true,
- enable_forester: false,
wait_time: 10,
..LightValidatorConfig::default()
}))
@@ -549,7 +547,6 @@ async fn test_epoch_double_registration() {
init(Some(LightValidatorConfig {
enable_indexer: false,
enable_prover: true,
- enable_forester: false,
wait_time: 10,
..LightValidatorConfig::default()
}))
diff --git a/forester/tests/test_utils.rs b/forester/tests/test_utils.rs
index eb72ceae1..88109a5da 100644
--- a/forester/tests/test_utils.rs
+++ b/forester/tests/test_utils.rs
@@ -28,7 +28,6 @@ pub async fn spawn_test_validator(config: Option<LightValidatorConfig>) {
let config = LightValidatorConfig {
enable_indexer: false,
enable_prover: false,
- enable_forester: false,
..LightValidatorConfig::default()
};
spawn_validator(config).await;