Skip to content

Commit

Permalink
Rename remove to delete
Browse files Browse the repository at this point in the history
  • Loading branch information
@chong-he
chong-he committed Aug 13, 2024
1 parent 0e4e9a4 commit eadec07
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 32 deletions.
56 changes: 28 additions & 28 deletions validator_manager/src/remove_validator.rs → validator_manager/src/delete_validator.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,20 @@ use types::PublicKeyBytes;

use crate::{common::vc_http_client, DumpConfig};

pub const CMD: &str = "remove";
pub const CMD: &str = "delete";
pub const VC_URL_FLAG: &str = "vc-url";
pub const VC_TOKEN_FLAG: &str = "vc-token";
pub const VALIDATOR_FLAG: &str = "validator";

#[derive(Debug)]
pub enum RemoveError {
pub enum DeleteError {
InvalidPublicKey,
RemoveFailed(eth2::Error),
DeleteFailed(eth2::Error),
}

pub fn cli_app() -> Command {
Command::new(CMD)
.about("Removes validator from VC")
.about("Deletes validator from VC")
.arg(
Arg::new(VC_URL_FLAG)
.long(VC_URL_FLAG)
Expand All @@ -48,42 +48,42 @@ pub fn cli_app() -> Command {
Arg::new(VALIDATOR_FLAG)
.long(VALIDATOR_FLAG)
.value_name("STRING")
.help("Validator that will be removed (pubkey).")
.help("Validator that will be deleted (pubkey).")
.action(ArgAction::Set),
)
}

#[derive(Clone, PartialEq, Debug, Serialize, Deserialize)]
pub struct RemoveConfig {
pub struct DeleteConfig {
pub vc_url: SensitiveUrl,
pub vc_token_path: PathBuf,
pub validator_to_remove: PublicKeyBytes,
pub validator_to_delete: PublicKeyBytes,
}

impl RemoveConfig {
impl DeleteConfig {
fn from_cli(matches: &ArgMatches) -> Result<Self, String> {
Ok(Self {
vc_token_path: clap_utils::parse_required(matches, VC_TOKEN_FLAG)?,
validator_to_remove: clap_utils::parse_required(matches, VALIDATOR_FLAG)?,
validator_to_delete: clap_utils::parse_required(matches, VALIDATOR_FLAG)?,
vc_url: clap_utils::parse_required(matches, VC_URL_FLAG)?,
})
}
}

pub async fn cli_run(matches: &ArgMatches, dump_config: DumpConfig) -> Result<(), String> {
let config = RemoveConfig::from_cli(matches)?;
let config = DeleteConfig::from_cli(matches)?;
if dump_config.should_exit_early(&config)? {
Ok(())
} else {
run(config).await
}
}

pub async fn run<'a>(config: RemoveConfig) -> Result<(), String> {
let RemoveConfig {
pub async fn run<'a>(config: DeleteConfig) -> Result<(), String> {
let DeleteConfig {
vc_url,
vc_token_path,
validator_to_remove,
validator_to_delete,
} = config;

let (http_client, _keystores) = vc_http_client(vc_url.clone(), &vc_token_path).await?;
Expand All @@ -92,13 +92,13 @@ pub async fn run<'a>(config: RemoveConfig) -> Result<(), String> {

if !validators
.iter()
.any(|validator| validator.validating_pubkey == validator_to_remove)
.any(|validator| validator.validating_pubkey == validator_to_delete)
{
return Err(format!("Validator {} doesn't exists", validator_to_remove));
return Err(format!("Validator {} doesn't exists", validator_to_delete));
}

let delete_request = DeleteKeystoresRequest {
pubkeys: vec![validator_to_remove],
pubkeys: vec![validator_to_delete],
};

let response = http_client
Expand All @@ -111,10 +111,10 @@ pub async fn run<'a>(config: RemoveConfig) -> Result<(), String> {
|| response[0].status == DeleteKeystoreStatus::NotFound
|| response[0].status == DeleteKeystoreStatus::NotActive
{
eprintln!("Problem with removing validator {}", validator_to_remove);
eprintln!("Problem with removing validator {}", validator_to_delete);
return Err(format!(
"Problem with removing validator {}",
validator_to_remove
validator_to_delete
));
}

Expand All @@ -138,7 +138,7 @@ mod test {
use validator_client::http_api::{test_utils::ApiTester, Config as HttpConfig};

struct TestBuilder {
remove_config: Option<RemoveConfig>,
delete_config: Option<DeleteConfig>,
src_import_builder: Option<ImportTestBuilder>,
http_config: HttpConfig,
vc_token: Option<String>,
Expand All @@ -148,7 +148,7 @@ mod test {
impl TestBuilder {
async fn new() -> Self {
Self {
remove_config: None,
delete_config: None,
src_import_builder: None,
http_config: ApiTester::default_http_config(),
vc_token: None,
Expand All @@ -160,7 +160,7 @@ mod test {
mut self,
count: u32,
first_index: u32,
index_of_validator_to_remove: usize,
index_of_validator_to_delete: usize,
) -> Self {
let builder = ImportTestBuilder::new_with_http_config(self.http_config.clone())
.await
Expand All @@ -178,13 +178,13 @@ mod test {

let import_config = builder.get_import_config();

self.remove_config = Some(RemoveConfig {
self.delete_config = Some(DeleteConfig {
vc_url: import_config.vc_url,
vc_token_path: import_config.vc_token_path,
validator_to_remove: PublicKeyBytes::from_str(
validator_to_delete: PublicKeyBytes::from_str(
format!(
"0x{}",
local_validators[index_of_validator_to_remove]
local_validators[index_of_validator_to_delete]
.voting_keystore
.pubkey()
)
Expand All @@ -202,8 +202,8 @@ mod test {
let import_test_result = import_builder.run_test().await;
assert!(import_test_result.result.is_ok());

let path = self.remove_config.clone().vc_token_path;
let url = self.remove_config.clone().vc_url;
let path = self.delete_config.clone().vc_token_path;
let url = self.delete_config.clone().vc_url;
let parent = path.parent();

fs::create_dir_all(parent).expect("Was not able to create parent directory");
Expand All @@ -216,7 +216,7 @@ mod test {
.open(path.clone())
.write_all(self.vc_token.clone().as_bytes());

let result = run(self.remove_config.clone()).await;
let result = run(self.delete_config.clone()).await;

if result.is_ok() {
let (http_client, _keystores) = vc_http_client(url, path.clone()).await;
Expand All @@ -226,7 +226,7 @@ mod test {
assert!(list_keystores_response
.iter()
.all(|keystore| keystore.validating_pubkey
!= self.remove_config.clone().validator_to_remove));
!= self.delete_config.clone().validator_to_delete));

return TestResult { result: Ok(()) };
}
Expand Down
8 changes: 4 additions & 4 deletions validator_manager/src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ use types::EthSpec;

pub mod common;
pub mod create_validators;
pub mod delete_validator;
pub mod import_validator;
pub mod import_validators;
pub mod list_validators;
pub mod move_validators;
pub mod remove_validator;

pub const CMD: &str = "validator_manager";

Expand Down Expand Up @@ -61,7 +61,7 @@ pub fn cli_app() -> Command {
.subcommand(import_validators::cli_app())
.subcommand(move_validators::cli_app())
.subcommand(list_validators::cli_app())
.subcommand(remove_validator::cli_app())
.subcommand(delete_validator::cli_app())
.subcommand(import_validator::cli_app())
}

Expand Down Expand Up @@ -93,8 +93,8 @@ pub fn run<E: EthSpec>(matches: &ArgMatches, env: Environment<E>) -> Result<(),
Some((list_validators::CMD, matches)) => {
list_validators::cli_run(matches, dump_config).await
}
Some((remove_validator::CMD, matches)) => {
remove_validator::cli_run(matches, dump_config).await
Some((delete_validator::CMD, matches)) => {
delete_validator::cli_run(matches, dump_config).await
}
Some((import_validator::CMD, matches)) => {
import_validator::cli_run(matches, dump_config).await
Expand Down

0 comments on commit eadec07

Please sign in to comment.