Merge pull request #328 from dongcarl/fine

Add test for tie breaking when sorting outputs

diff --git a/README.md b/README.md
index 5b84449249050102d6a01f99163921f3179a3c86..f2a39670b552196b17fe6f5325b7ff5cf0bf8ce6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,6 +1,9 @@
 Rust-Lightning, not Rusty's Lightning!
+=====
 
-Currently somewhere near 15% towards usable, published to see if there is any
+Documentation can be found at [docs.rs](https://docs.rs/lightning/)
+
+Currently somewhere near 20% towards usable, published to see if there is any
 real interest from folks in using a lightning rust library.
 
 The goal is to provide a full-featured but also incredibly flexible lightning

diff --git a/src/ln/channelmonitor.rs b/src/ln/channelmonitor.rs
index ac03b7bb8c1c6983f8b7caf0272ab75dc77ca5ee..25f41d882964d0e6d0af4ac89f36f9d0bcb1ddf8 100644 (file)
--- a/src/ln/channelmonitor.rs
+++ b/src/ln/channelmonitor.rs
@@ -48,8 +48,8 @@ use std::{hash,cmp, mem};
 /// An error enum representing a failure to persist a channel monitor update.
 #[derive(Clone)]
 pub enum ChannelMonitorUpdateErr {
-       /// Used to indicate a temporary failure (eg connection to a watchtower failed, but is expected
-       /// to succeed at some point in the future).
+       /// Used to indicate a temporary failure (eg connection to a watchtower or remote backup of
+       /// our state failed, but is expected to succeed at some point in the future).
        ///
        /// Such a failure will "freeze" a channel, preventing us from revoking old states or
        /// submitting new commitment transactions to the remote party.
@@ -71,6 +71,10 @@ pub enum ChannelMonitorUpdateErr {
        /// Note that even if updates made after TemporaryFailure succeed you must still call
        /// test_restore_channel_monitor to ensure you have the latest monitor and re-enable normal
        /// channel operation.
+       ///
+       /// For deployments where a copy of ChannelMonitors and other local state are backed up in a
+       /// remote location (with local copies persisted immediately), it is anticipated that all
+       /// updates will return TemporaryFailure until the remote copies could be updated.
        TemporaryFailure,
        /// Used to indicate no further channel monitor updates will be allowed (eg we've moved on to a
        /// different watchtower and cannot update with all watchtowers that were previously informed