gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Rename AccountsDb plugins to Geyser plugins (backport #23604) (#23668)

Browse Source 
* 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:
mergify[bot]
2022-03-15 05:04:17 +00:00
committed by GitHub
parent 5c3e1967e6
commit 8b0576d954
31 changed files with 241 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
validator/src/bin/solana-test-validator.rs
View File

@ -311,13 +311,14 @@ fn main() {
),
)
.arg(
Arg::with_name("accountsdb_plugin_config")
.long("accountsdb-plugin-config")
Arg::with_name("geyser_plugin_config")
.long("geyser-plugin-config")
.alias("accountsdb-plugin-config")
.value_name("FILE")
.takes_value(true)
.multiple(true)
.hidden(true)
.help("Specify the configuration file for the AccountsDb plugin."),
.help("Specify the configuration file for the Geyser plugin."),
)
.arg(
Arg::with_name("no_accounts_db_caching")
@ -683,9 +684,9 @@ fn main() {
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)
if matches.is_present("geyser_plugin_config") {
genesis.geyser_plugin_config_files = Some(
values_t_or_exit!(matches, "geyser_plugin_config", String)
.into_iter()
.map(PathBuf::from)
.collect(),

13
validator/src/main.rs
View File

@ -1396,13 +1396,14 @@ pub fn main() {
.help("Number of threads to use for servicing AccountsDb Replication requests"),
)
.arg(
Arg::with_name("accountsdb_plugin_config")
.long("accountsdb-plugin-config")
Arg::with_name("geyser_plugin_config")
.long("geyser-plugin-config")
.alias("accountsdb-plugin-config")
.value_name("FILE")
.takes_value(true)
.multiple(true)
.hidden(true)
.help("Specify the configuration file for the AccountsDb plugin."),
.help("Specify the configuration file for the Geyser plugin."),
)
.arg(
Arg::with_name("halt_on_known_validators_accounts_hash_mismatch")
@ -2218,9 +2219,9 @@ pub fn main() {
None
};
let accountsdb_plugin_config_files = if matches.is_present("accountsdb_plugin_config") {
let geyser_plugin_config_files = if matches.is_present("geyser_plugin_config") {
Some(
values_t_or_exit!(matches, "accountsdb_plugin_config", String)
values_t_or_exit!(matches, "geyser_plugin_config", String)
.into_iter()
.map(PathBuf::from)
.collect(),
@ -2275,7 +2276,7 @@ pub fn main() {
rpc_scan_and_fix_roots: matches.is_present("rpc_scan_and_fix_roots"),
},
accountsdb_repl_service_config,
accountsdb_plugin_config_files,
geyser_plugin_config_files,
rpc_addrs: value_t!(matches, "rpc_port", u16).ok().map(|rpc_port| {
(
SocketAddr::new(rpc_bind_address, rpc_port),