script_subscribe IntoIterator accepts Borrow<&Script>

So that is callable with `&Vec<Script>` and `Vec<&Script>`

Author: RCasatta

src/api.rs

@@ -1,5 +1,6 @@
 //! Electrum APIs
 
+use std::borrow::Borrow;
 use std::convert::TryInto;
 
 use bitcoin::consensus::encode::{deserialize, serialize};
@@ -109,9 +110,12 @@ pub trait ElectrumApi {
     /// Batch version of [`script_subscribe`](#method.script_subscribe).
     ///
     /// Takes a list of scripts and returns a list of script status responses.
+    /// 
+    /// Note you should pass a reference to a collection because otherwise an expensive clone is made
     fn batch_script_subscribe<'s, I>(&self, scripts: I) -> Result<Vec<Option<ScriptStatus>>, Error>
     where
-        I: IntoIterator<Item = &'s Script> + Clone;
+        I: IntoIterator + Clone,
+        I::Item: Borrow<&'s Script>;
 
     /// Subscribes to notifications for activity on a specific *scriptPubKey*.
     ///

src/batch.rs

@@ -2,6 +2,8 @@
 //!
 //! This module contains definitions and helper functions used when making batch calls.
 
+use std::borrow::Borrow;
+
 use bitcoin::hashes::hex::ToHex;
 use bitcoin::{Script, Txid};
 
@@ -44,8 +46,8 @@ impl Batch {
     }
 
     /// Add one `blockchain.scripthash.listunspent` request to the batch queue
-    pub fn script_subscribe(&mut self, script: &Script) {
-        let params = vec![Param::String(script.to_electrum_scripthash().to_hex())];
+    pub fn script_subscribe<'a, B: Borrow<&'a Script>>(&mut self, script: B) {
+        let params = vec![Param::String(script.borrow().to_electrum_scripthash().to_hex())];
         self.calls
             .push((String::from("blockchain.scripthash.subscribe"), params));
     }

src/client.rs

@@ -1,6 +1,6 @@
 //! Electrum Client
 
-use std::sync::RwLock;
+use std::{sync::RwLock, borrow::Borrow};
 
 use log::{info, warn};
 
@@ -225,7 +225,8 @@ impl ElectrumApi for Client {
     #[inline]
     fn batch_script_subscribe<'s, I>(&self, scripts: I) -> Result<Vec<Option<ScriptStatus>>, Error>
     where
-        I: IntoIterator<Item = &'s Script> + Clone,
+        I: IntoIterator + Clone,
+        I::Item: Borrow<&'s Script>,
     {
         impl_inner_call!(self, batch_script_subscribe, scripts.clone())
     }

src/raw_client.rs

@@ -2,6 +2,7 @@
 //!
 //! This module contains the definition of the raw client that wraps the transport method
 
+use std::borrow::Borrow;
 use std::collections::{BTreeMap, BTreeSet, HashMap, VecDeque};
 use std::io::{BufRead, BufReader, Read, Write};
 use std::mem::drop;
@@ -850,13 +851,14 @@ impl<T: Read + Write> ElectrumApi for RawClient<T> {
 
     fn batch_script_subscribe<'s, I>(&self, scripts: I) -> Result<Vec<Option<ScriptStatus>>, Error>
     where
-        I: IntoIterator<Item = &'s Script> + Clone,
+        I: IntoIterator + Clone,
+        I::Item: Borrow<&'s Script>,
     {
         {
             let mut script_notifications = self.script_notifications.lock()?;
 
-            for script in scripts.clone().into_iter() {
-                let script_hash = script.to_electrum_scripthash();
+            for script in scripts.clone() {
+                let script_hash = script.borrow().to_electrum_scripthash();
                 if script_notifications.contains_key(&script_hash) {
                     return Err(Error::AlreadySubscribed(script_hash));
                 }