Skip to content

Commit

Permalink
Standardise on the shielded-scan feature name (#8038)
Browse files Browse the repository at this point in the history
  • Loading branch information
teor2345 authored Dec 1, 2023
1 parent db05845 commit fc2576b
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions zebrad/src/commands/start.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
2 changes: 1 addition & 1 deletion zebrad/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
2 changes: 1 addition & 1 deletion zebrad/tests/acceptance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit fc2576b

Please sign in to comment.