Skip to content
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.

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

agave-validator: add args tests for staked-nodes-overrides #4903

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
55 changes: 49 additions & 6 deletions validator/src/commands/staked_nodes_overrides/mod.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,26 @@
use {
crate::{admin_rpc_service, cli::DefaultArgs},
crate::{admin_rpc_service, cli::DefaultArgs, commands::FromClapArgMatches},
clap::{App, Arg, ArgMatches, SubCommand},
std::{path::Path, process::exit},
};

const COMMAND: &str = "staked-nodes-overrides";

#[derive(Debug, PartialEq)]
pub struct StakedNodesOverridesArg {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: StakedNodesOverridesArg ==> StakedNodesOverridesArgs

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

79493b3 🫡

pub path: String,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should seemingly be a PathBuf; I can see the argument for changing the type separate from this PR. Any interest in adjusting the type to be a PathBuf in another PR, and then rebasing this PR on top of that one when it lands ?

}

impl FromClapArgMatches for StakedNodesOverridesArg {
fn from_clap_arg_match(matches: &ArgMatches) -> Self {
StakedNodesOverridesArg {
path: matches.value_of("path").unwrap().to_string(),
}
}
}

pub fn command(_default_args: &DefaultArgs) -> App<'_, '_> {
SubCommand::with_name("staked-nodes-overrides")
SubCommand::with_name(COMMAND)
.about("Overrides stakes of specific node identities.")
.arg(
Arg::with_name("path")
Expand All @@ -22,23 +37,51 @@ pub fn command(_default_args: &DefaultArgs) -> App<'_, '_> {
}

pub fn execute(matches: &ArgMatches, ledger_path: &Path) {
if !matches.is_present("path") {
let staked_nodes_overrides_arg = StakedNodesOverridesArg::from_clap_arg_match(matches);
if staked_nodes_overrides_arg.path.is_empty() {
println!("staked-nodes-overrides requires argument of location of the configuration");
exit(1);
}

let path = matches.value_of("path").unwrap();

let admin_client = admin_rpc_service::connect(ledger_path);
admin_rpc_service::runtime()
.block_on(async move {
admin_client
.await?
.set_staked_nodes_overrides(path.to_string())
.set_staked_nodes_overrides(staked_nodes_overrides_arg.path)
.await
})
.unwrap_or_else(|err| {
println!("setStakedNodesOverrides request failed: {err}");
exit(1);
});
}

#[cfg(test)]
mod tests {
use {
super::*,
crate::commands::tests::{
verify_args_struct_by_command, verify_args_struct_by_command_is_error,
},
};

#[test]
fn verify_args_struct_by_command_staked_nodes_overrides_default() {
verify_args_struct_by_command_is_error::<StakedNodesOverridesArg>(
command(&DefaultArgs::default()),
vec![COMMAND],
);
}

#[test]
fn verify_args_struct_by_command_staked_nodes_overrides_path() {
verify_args_struct_by_command(
command(&DefaultArgs::default()),
vec![COMMAND, "test.json"],
StakedNodesOverridesArg {
path: "test.json".to_string(),
},
);
}
}
Loading