Merge pull request #86 from TheBlueMatt/2018-07-event-fixes

[rust-lightning] / src / ln / peer_handler.rs

diff --git a/src/ln/peer_handler.rs b/src/ln/peer_handler.rs
index 7fde10d0908d86400fe8a4ca9df47a00a76884d0..bf0052d0236cdb69a469b0fa53a456c3bde8c55c 100644 (file)
--- a/src/ln/peer_handler.rs
+++ b/src/ln/peer_handler.rs
@@ -628,11 +628,8 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
                                        Event::PaymentReceived {..} => { /* Hand upstream */ },
                                        Event::PaymentSent {..} => { /* Hand upstream */ },
                                        Event::PaymentFailed {..} => { /* Hand upstream */ },
+                                       Event::PendingHTLCsForwardable {..} => { /* Hand upstream */ },
 
-                                       Event::PendingHTLCsForwardable {..} => {
-                                               //TODO: Handle upstream in some confused form so that upstream just knows
-                                               //to call us somehow?
-                                       },
                                        Event::SendOpenChannel { ref node_id, ref msg } => {
                                                let (mut descriptor, peer) = get_peer_for_forwarding!(node_id, {
                                                                //TODO: Drop the pending channel? (or just let it timeout, but that sucks)
@@ -750,6 +747,7 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
                                                        descriptor.disconnect_socket();
                                                        self.message_handler.chan_handler.peer_disconnected(&node_id, false);
                                                }
+                                               continue;
                                        },
                                }