* Rename AccountsDb plugins to Geyser plugins (#23604)
(cherry picked from commit 102dd68a03
)
# Conflicts:
# Cargo.lock
# Cargo.toml
# core/Cargo.toml
# core/src/replay_stage.rs
# core/src/tvu.rs
# geyser-plugin-interface/Cargo.toml
# geyser-plugin-manager/Cargo.toml
# geyser-plugin-manager/src/geyser_plugin_service.rs
# geyser-plugin-manager/src/slot_status_notifier.rs
# validator/src/bin/solana-test-validator.rs
# validator/src/main.rs
* Fix conflicts
Co-authored-by: Tyera Eulberg <tyera@solana.com>
This commit is contained in:
@@ -105,7 +105,7 @@ pub struct TestValidatorGenesis {
|
||||
pub authorized_voter_keypairs: Arc<RwLock<Vec<Arc<Keypair>>>>,
|
||||
pub max_ledger_shreds: Option<u64>,
|
||||
pub max_genesis_archive_unpacked_size: Option<u64>,
|
||||
pub accountsdb_plugin_config_files: Option<Vec<PathBuf>>,
|
||||
pub geyser_plugin_config_files: Option<Vec<PathBuf>>,
|
||||
pub accounts_db_caching_enabled: bool,
|
||||
deactivate_feature_set: HashSet<Pubkey>,
|
||||
}
|
||||
@@ -132,7 +132,7 @@ impl Default for TestValidatorGenesis {
|
||||
authorized_voter_keypairs: Arc::<RwLock<Vec<Arc<Keypair>>>>::default(),
|
||||
max_ledger_shreds: Option::<u64>::default(),
|
||||
max_genesis_archive_unpacked_size: Option::<u64>::default(),
|
||||
accountsdb_plugin_config_files: Option::<Vec<PathBuf>>::default(),
|
||||
geyser_plugin_config_files: Option::<Vec<PathBuf>>::default(),
|
||||
accounts_db_caching_enabled: bool::default(),
|
||||
deactivate_feature_set: HashSet::<Pubkey>::default(),
|
||||
}
|
||||
@@ -627,7 +627,7 @@ impl TestValidator {
|
||||
}
|
||||
|
||||
let mut validator_config = ValidatorConfig {
|
||||
accountsdb_plugin_config_files: config.accountsdb_plugin_config_files.clone(),
|
||||
geyser_plugin_config_files: config.geyser_plugin_config_files.clone(),
|
||||
accounts_db_caching_enabled: config.accounts_db_caching_enabled,
|
||||
rpc_addrs: Some((
|
||||
SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), node.info.rpc.port()),
|
||||
|
Reference in New Issue
Block a user