Standardise on the shielded-scan feature name (#8038)
This commit is contained in:
parent
db05845f98
commit
fc2576b27d
|
@ -288,14 +288,14 @@ impl StartCmd {
|
|||
info!("spawning syncer task");
|
||||
let syncer_task_handle = tokio::spawn(syncer.sync().in_current_span());
|
||||
|
||||
#[cfg(feature = "zebra-scan")]
|
||||
#[cfg(feature = "shielded-scan")]
|
||||
// Spawn never ending scan task.
|
||||
let scan_task_handle = {
|
||||
info!("spawning shielded scanner with configured viewing keys");
|
||||
zebra_scan::spawn_init(&config.shielded_scan, config.network.network, state)
|
||||
};
|
||||
|
||||
#[cfg(not(feature = "zebra-scan"))]
|
||||
#[cfg(not(feature = "shielded-scan"))]
|
||||
// Spawn a dummy scan task which doesn't do anything and never finishes.
|
||||
let scan_task_handle: tokio::task::JoinHandle<Result<(), Report>> =
|
||||
tokio::spawn(std::future::pending().in_current_span());
|
||||
|
|
|
@ -44,7 +44,7 @@ pub struct ZebradConfig {
|
|||
/// Mining configuration
|
||||
pub mining: zebra_rpc::config::mining::Config,
|
||||
|
||||
#[cfg(feature = "zebra-scan")]
|
||||
#[cfg(feature = "shielded-scan")]
|
||||
/// Scanner configuration
|
||||
pub shielded_scan: zebra_scan::config::Config,
|
||||
}
|
||||
|
|
|
@ -2805,7 +2805,7 @@ async fn fully_synced_rpc_z_getsubtreesbyindex_snapshot_test() -> Result<()> {
|
|||
}
|
||||
|
||||
/// Test that the scanner task gets started when the node starts.
|
||||
#[cfg(feature = "zebra-scan")]
|
||||
#[cfg(feature = "shielded-scan")]
|
||||
#[test]
|
||||
fn scan_task_starts() -> Result<()> {
|
||||
use indexmap::IndexMap;
|
||||
|
|
Loading…
Reference in New Issue