Waiter accept receiver instead of returning sender

Author: RCasatta

src/bin/electrs.rs

@@ -4,6 +4,7 @@ extern crate log;
 
 extern crate electrs;
 
+use crossbeam_channel::{self as channel};
 use error_chain::ChainedError;
 use std::process;
 use std::sync::{Arc, RwLock};
@@ -41,7 +42,8 @@ fn fetch_from(config: &Config, store: &Store) -> FetchFrom {
 }
 
 fn run_server(config: Arc<Config>) -> Result<()> {
-    let (block_hash_notify, signal) = Waiter::start();
+    let (block_hash_notify, block_hash_receive) = channel::bounded(1);
+    let signal = Waiter::start(block_hash_receive);
     let metrics = Metrics::new(config.monitoring_addr);
     metrics.start();
 

src/bin/tx-fingerprint-stats.rs

@@ -21,7 +21,7 @@ fn main() {
         util::has_prevout,
     };
 
-    let signal = Waiter::start().1;
+    let signal = Waiter::start(crossbeam_channel::never());
     let config = Config::from_args();
     let store = Arc::new(Store::open(&config.db_path.join("newindex"), &config));
 

src/signal.rs

@@ -1,5 +1,5 @@
 use bitcoin::BlockHash;
-use crossbeam_channel::{self as channel, after, select, Sender};
+use crossbeam_channel::{self as channel, after, select};
 use std::thread;
 use std::time::{Duration, Instant};
 
@@ -27,19 +27,14 @@ fn notify(signals: &[i32]) -> channel::Receiver<i32> {
 }
 
 impl Waiter {
-    pub fn start() -> (Sender<BlockHash>, Waiter) {
-        let (block_hash_notify, block_hash_receive) = channel::bounded(1);
-
-        (
-            block_hash_notify,
-            Waiter {
-                receiver: notify(&[
-                    SIGINT, SIGTERM,
-                    SIGUSR1, // allow external triggering (e.g. via bitcoind `blocknotify`)
-                ]),
-                zmq_receiver: block_hash_receive,
-            },
-        )
+    pub fn start(block_hash_receive: channel::Receiver<BlockHash>) -> Waiter {
+        Waiter {
+            receiver: notify(&[
+                SIGINT, SIGTERM,
+                SIGUSR1, // allow external triggering (e.g. via bitcoind `blocknotify`)
+            ]),
+            zmq_receiver: block_hash_receive,
+        }
     }
 
     pub fn wait(&self, duration: Duration, accept_block_notification: bool) -> Result<()> {

tests/common.rs

@@ -124,7 +124,7 @@ impl TestRunner {
             //tor_proxy: Option<std::net::SocketAddr>,
         });
 
-        let signal = Waiter::start().1;
+        let signal = Waiter::start(crossbeam_channel::never());
         let metrics = Metrics::new(rand_available_addr());
         metrics.start();