]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Merge pull request #997 from ariard/2021-07-add-chan-closed
authorMatt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Tue, 21 Sep 2021 20:35:29 +0000 (20:35 +0000)
committerGitHub <noreply@github.com>
Tue, 21 Sep 2021 20:35:29 +0000 (20:35 +0000)
Add Event::ChannelClosed generation

1  2 
lightning/src/ln/channelmanager.rs
lightning/src/util/ser.rs

index c06fe0075ec4188768e4e390fa717b8ccd80e108,56dcb057ddf10af8106f24904f05f849840c7c21..8ce19cc0c40d408e2ba2f42428034dc8789451b9
@@@ -52,9 -52,9 +52,9 @@@ use ln::onion_utils
  use ln::msgs::{ChannelMessageHandler, DecodeError, LightningError, OptionalField};
  use chain::keysinterface::{Sign, KeysInterface, KeysManager, InMemorySigner};
  use util::config::UserConfig;
- use util::events::{EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider};
+ use util::events::{EventHandler, EventsProvider, MessageSendEvent, MessageSendEventsProvider, ClosureReason};
  use util::{byte_utils, events};
 -use util::ser::{Readable, ReadableArgs, MaybeReadable, Writeable, Writer};
 +use util::ser::{BigSize, FixedLengthReader, Readable, ReadableArgs, MaybeReadable, Writeable, Writer};
  use util::chacha20::{ChaCha20, ChaChaReader};
  use util::logger::{Logger, Level};
  use util::errors::APIError;
Simple merge