SimpleArcChannelManager type: remove outer Arc for flexibility

[rust-lightning] / background-processor / src / lib.rs

diff --git a/background-processor/src/lib.rs b/background-processor/src/lib.rs
index 06a2c00e28cc0dc80afdea89da48a330f8fdfadf..0c7191fbad2bd74fc8ebeafebfe044dbfa97ab96 100644 (file)
--- a/background-processor/src/lib.rs
+++ b/background-processor/src/lib.rs
@@ -54,7 +54,7 @@ impl BackgroundProcessor {
        /// [`FilesystemPersister::persist_manager`]: ../lightning_persister/struct.FilesystemPersister.html#impl
        pub fn start<PM, Signer, M, T, K, F, L>(persist_manager: PM, manager: Arc<ChannelManager<Signer, Arc<M>, Arc<T>, Arc<K>, Arc<F>, Arc<L>>>, logger: Arc<L>) -> Self
        where Signer: 'static + Sign,
-             M: 'static + chain::Watch<ChanSigner=Signer>,
+             M: 'static + chain::Watch<Signer>,
              T: 'static + BroadcasterInterface,
              K: 'static + KeysInterface<Signer=Signer>,
              F: 'static + FeeEstimator,
@@ -124,7 +124,7 @@ mod tests {
        type ChainMonitor = chainmonitor::ChainMonitor<InMemorySigner, Arc<test_utils::TestChainSource>, Arc<test_utils::TestBroadcaster>, Arc<test_utils::TestFeeEstimator>, Arc<test_utils::TestLogger>, Arc<FilesystemPersister>>;
 
        struct Node {
-               node: SimpleArcChannelManager<ChainMonitor, test_utils::TestBroadcaster, test_utils::TestFeeEstimator, test_utils::TestLogger>,
+               node: Arc<SimpleArcChannelManager<ChainMonitor, test_utils::TestBroadcaster, test_utils::TestFeeEstimator, test_utils::TestLogger>>,
                persister: Arc<FilesystemPersister>,
                logger: Arc<test_utils::TestLogger>,
        }
@@ -275,7 +275,7 @@ mod tests {
                // Test that if we encounter an error during manager persistence, the thread panics.
                fn persist_manager<Signer, M, T, K, F, L>(_data: &ChannelManager<Signer, Arc<M>, Arc<T>, Arc<K>, Arc<F>, Arc<L>>) -> Result<(), std::io::Error>
                where Signer: 'static + Sign,
-                     M: 'static + chain::Watch<ChanSigner=Signer>,
+                     M: 'static + chain::Watch<Signer>,
                      T: 'static + BroadcasterInterface,
                      K: 'static + KeysInterface<Signer=Signer>,
                      F: 'static + FeeEstimator,