Fix clippy expect_fun_call warnings

Author: shesek

src/config.rs

@@ -49,7 +49,7 @@ pub struct Config {
 fn str_to_socketaddr(address: &str, what: &str) -> SocketAddr {
     address
         .to_socket_addrs()
-        .expect(&format!("unable to resolve {} address", what))
+        .unwrap_or_else(|_| panic!("unable to resolve {} address", what))
         .collect::<Vec<_>>()
         .pop()
         .unwrap()

src/electrum.rs

@@ -576,7 +576,8 @@ impl RPC {
         let chan = Channel::unbounded();
         let acceptor = chan.sender();
         spawn_thread("acceptor", move || {
-            let listener = TcpListener::bind(addr).expect(&format!("bind({}) failed", addr));
+            let listener =
+                TcpListener::bind(addr).unwrap_or_else(|_| panic!("bind({}) failed", addr));
             info!("Electrum RPC server running on {}", addr);
             loop {
                 let (stream, addr) = listener.accept().expect("accept failed");

src/metrics.rs

@@ -67,10 +67,8 @@ impl Metrics {
     }
 
     pub fn start(&self) {
-        let server = tiny_http::Server::http(self.addr).expect(&format!(
-            "failed to start monitoring HTTP server at {}",
-            self.addr
-        ));
+        let server = tiny_http::Server::http(self.addr)
+            .unwrap_or_else(|_| panic!("failed to start monitoring HTTP server at {}", self.addr));
         start_process_exporter(&self);
         let reg = self.reg.clone();
         spawn_thread("metrics", move || loop {

src/new_index/fetch.rs

@@ -158,10 +158,10 @@ fn blkfiles_reader(blk_files: Vec<PathBuf>) -> Fetcher<Vec<u8>> {
         spawn_thread("blkfiles_reader", move || {
             for path in blk_files {
                 trace!("reading {:?}", path);
-                let blob = fs::read(&path).expect(&format!("failed to read {:?}", path));
+                let blob = fs::read(&path).unwrap_or_else(|_| panic!("failed to read {:?}", path));
                 sender
                     .send(blob)
-                    .expect(&format!("failed to send {:?} contents", path));
+                    .unwrap_or_else(|_| panic!("failed to send {:?} contents", path));
             }
         }),
     )

src/new_index/mempool.rs

@@ -323,8 +323,9 @@ impl Mempool {
                 .map(|(index, txi)| {
                     (
                         index as u32,
-                        txos.get(&txi.previous_output)
-                            .expect(&format!("missing outpoint {:?}", txi.previous_output)),
+                        txos.get(&txi.previous_output).unwrap_or_else(|| {
+                            panic!("missing outpoint {:?}", txi.previous_output)
+                        }),
                     )
                 })
                 .collect();
@@ -445,7 +446,7 @@ impl Mempool {
         for txid in &to_remove {
             self.txstore
                 .remove(*txid)
-                .expect(&format!("missing mempool tx {}", txid));
+                .unwrap_or_else(|| panic!("missing mempool tx {}", txid));
 
             self.feeinfo.remove(*txid).or_else(|| {
                 warn!("missing mempool tx feeinfo {}", txid);

src/new_index/schema.rs

@@ -1056,7 +1056,7 @@ fn index_transaction(
         }
         let prev_txo = previous_txos_map
             .get(&txi.previous_output)
-            .expect(&format!("missing previous txo {}", txi.previous_output));
+            .unwrap_or_else(|| panic!("missing previous txo {}", txi.previous_output));
 
         let history = TxHistoryRow::new(
             &prev_txo.script_pubkey,

src/util/block.rs

@@ -92,10 +92,9 @@ impl HeaderList {
         let null_hash = BlockHash::default();
 
         while blockhash != null_hash {
-            let header = headers_map.remove(&blockhash).expect(&format!(
-                "missing expected blockhash in headers map: {:?}",
-                blockhash
-            ));
+            let header = headers_map.remove(&blockhash).unwrap_or_else(|| {
+                panic!("missing expected blockhash in headers map: {:?}", blockhash)
+            });
             blockhash = header.prev_blockhash;
             headers_chain.push(header);
         }
@@ -138,7 +137,7 @@ impl HeaderList {
             0
         } else {
             self.header_by_blockhash(&prev_blockhash)
-                .expect(&format!("{} is not part of the blockchain", prev_blockhash))
+                .unwrap_or_else(|| panic!("{} is not part of the blockchain", prev_blockhash))
                 .height()
                 + 1
         };