X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Fchain%2Fmod.rs;h=e4bb66c7e755905058fa7b0f44520046773b5601;hb=58a4f6c4ad3c262f7ed7009f6c99d36936e958b4;hp=2d62016e9ec53e35b771efb5bdce8fde860941fe;hpb=ec35fe62a12e392ebf2aed90f8f4124ec9c6f7d7;p=rust-lightning diff --git a/lightning/src/chain/mod.rs b/lightning/src/chain/mod.rs index 2d62016e..e4bb66c7 100644 --- a/lightning/src/chain/mod.rs +++ b/lightning/src/chain/mod.rs @@ -18,11 +18,15 @@ use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, ChannelMonitor use chain::keysinterface::Sign; use chain::transaction::{OutPoint, TransactionData}; +use prelude::*; + pub mod chaininterface; pub mod chainmonitor; pub mod channelmonitor; pub mod transaction; pub mod keysinterface; +pub(crate) mod onchaintx; +pub(crate) mod package; /// An error when accessing the chain via [`Access`]. #[derive(Clone)] @@ -246,7 +250,7 @@ pub struct WatchedOutput { pub script_pubkey: Script, } -impl Listen for std::ops::Deref { +impl Listen for core::ops::Deref { fn block_connected(&self, block: &Block, height: u32) { (**self).block_connected(block, height); } @@ -256,7 +260,7 @@ impl Listen for std::ops::Deref { } } -impl Listen for (T, U) +impl Listen for (T, U) where T::Target: Listen, U::Target: Listen,