projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #931 from jkczyz/2021-05-http-client-reconnect
[rust-lightning]
/
lightning
/
src
/
chain
/
mod.rs
diff --git
a/lightning/src/chain/mod.rs
b/lightning/src/chain/mod.rs
index 2d62016e9ec53e35b771efb5bdce8fde860941fe..e4bb66c7e755905058fa7b0f44520046773b5601 100644
(file)
--- 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 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 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)]
/// An error when accessing the chain via [`Access`].
#[derive(Clone)]
@@
-246,7
+250,7
@@
pub struct WatchedOutput {
pub script_pubkey: Script,
}
pub script_pubkey: Script,
}
-impl<T: Listen> Listen for
std
::ops::Deref<Target = T> {
+impl<T: Listen> Listen for
core
::ops::Deref<Target = T> {
fn block_connected(&self, block: &Block, height: u32) {
(**self).block_connected(block, height);
}
fn block_connected(&self, block: &Block, height: u32) {
(**self).block_connected(block, height);
}
@@
-256,7
+260,7
@@
impl<T: Listen> Listen for std::ops::Deref<Target = T> {
}
}
}
}
-impl<T:
std::ops::Deref, U: std
::ops::Deref> Listen for (T, U)
+impl<T:
core::ops::Deref, U: core
::ops::Deref> Listen for (T, U)
where
T::Target: Listen,
U::Target: Listen,
where
T::Target: Listen,
U::Target: Listen,