add accountsdb-plugin-config to test-validator
This commit is contained in:
parent
8d22ca5076
commit
c2a94a8fb0
|
@ -94,6 +94,7 @@ pub struct TestValidatorGenesis {
|
||||||
pub authorized_voter_keypairs: Arc<RwLock<Vec<Arc<Keypair>>>>,
|
pub authorized_voter_keypairs: Arc<RwLock<Vec<Arc<Keypair>>>>,
|
||||||
pub max_ledger_shreds: Option<u64>,
|
pub max_ledger_shreds: Option<u64>,
|
||||||
pub max_genesis_archive_unpacked_size: Option<u64>,
|
pub max_genesis_archive_unpacked_size: Option<u64>,
|
||||||
|
pub accountsdb_plugin_config_files: Option<Vec<PathBuf>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TestValidatorGenesis {
|
impl TestValidatorGenesis {
|
||||||
|
@ -510,6 +511,7 @@ impl TestValidator {
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut validator_config = ValidatorConfig {
|
let mut validator_config = ValidatorConfig {
|
||||||
|
accountsdb_plugin_config_files: config.accountsdb_plugin_config_files.clone(),
|
||||||
rpc_addrs: Some((
|
rpc_addrs: Some((
|
||||||
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), node.info.rpc.port()),
|
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), node.info.rpc.port()),
|
||||||
SocketAddr::new(
|
SocketAddr::new(
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
use {
|
use {
|
||||||
clap::{crate_name, value_t, value_t_or_exit, App, Arg},
|
clap::{crate_name, value_t, value_t_or_exit, values_t_or_exit, App, Arg},
|
||||||
log::*,
|
log::*,
|
||||||
solana_clap_utils::{
|
solana_clap_utils::{
|
||||||
input_parsers::{pubkey_of, pubkeys_of, value_of},
|
input_parsers::{pubkey_of, pubkeys_of, value_of},
|
||||||
|
@ -282,6 +282,15 @@ fn main() {
|
||||||
If the ledger already exists then this parameter is silently ignored",
|
If the ledger already exists then this parameter is silently ignored",
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
.arg(
|
||||||
|
Arg::with_name("accountsdb_plugin_config")
|
||||||
|
.long("accountsdb-plugin-config")
|
||||||
|
.value_name("FILE")
|
||||||
|
.takes_value(true)
|
||||||
|
.multiple(true)
|
||||||
|
.hidden(true)
|
||||||
|
.help("Specify the configuration file for the AccountsDb plugin."),
|
||||||
|
)
|
||||||
.get_matches();
|
.get_matches();
|
||||||
|
|
||||||
let output = if matches.is_present("quiet") {
|
let output = if matches.is_present("quiet") {
|
||||||
|
@ -596,6 +605,15 @@ fn main() {
|
||||||
genesis.bind_ip_addr(bind_address);
|
genesis.bind_ip_addr(bind_address);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if matches.is_present("accountsdb_plugin_config") {
|
||||||
|
genesis.accountsdb_plugin_config_files = Some(
|
||||||
|
values_t_or_exit!(matches, "accountsdb_plugin_config", String)
|
||||||
|
.into_iter()
|
||||||
|
.map(PathBuf::from)
|
||||||
|
.collect(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
match genesis.start_with_mint_address(mint_address, socket_addr_space) {
|
match genesis.start_with_mint_address(mint_address, socket_addr_space) {
|
||||||
Ok(test_validator) => {
|
Ok(test_validator) => {
|
||||||
*admin_service_cluster_info.write().unwrap() = Some(test_validator.cluster_info());
|
*admin_service_cluster_info.write().unwrap() = Some(test_validator.cluster_info());
|
||||||
|
|
Loading…
Reference in New Issue