projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move ChannelMonitorUpdateErr to chain as it is a chain::Watch val
[rust-lightning]
/
lightning
/
src
/
chain
/
chainmonitor.rs
diff --git
a/lightning/src/chain/chainmonitor.rs
b/lightning/src/chain/chainmonitor.rs
index c5468ca85783fef4274f0cd9a1afcec7318b073d..8126e4d52276efee0f8466297fea0842d31e5d5a 100644
(file)
--- a/
lightning/src/chain/chainmonitor.rs
+++ b/
lightning/src/chain/chainmonitor.rs
@@
-27,9
+27,9
@@
use bitcoin::blockdata::block::{Block, BlockHeader};
use bitcoin::hash_types::Txid;
use chain;
use bitcoin::hash_types::Txid;
use chain;
-use chain::{Filter, WatchedOutput};
+use chain::{
ChannelMonitorUpdateErr,
Filter, WatchedOutput};
use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use chain::chaininterface::{BroadcasterInterface, FeeEstimator};
-use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate,
ChannelMonitorUpdateErr,
Balance, MonitorEvent, TransactionOutputs};
+use chain::channelmonitor::{ChannelMonitor, ChannelMonitorUpdate, Balance, MonitorEvent, TransactionOutputs};
use chain::transaction::{OutPoint, TransactionData};
use chain::keysinterface::Sign;
use util::logger::Logger;
use chain::transaction::{OutPoint, TransactionData};
use chain::keysinterface::Sign;
use util::logger::Logger;