From: Matt Corallo <649246+TheBlueMatt@users.noreply.github.com>
Date: Thu, 28 May 2020 19:34:42 +0000 (+0000)
Subject: Merge pull request #620 from TheBlueMatt/2020-05-pre-bindings-cleanups
X-Git-Tag: v0.0.12~61
X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=2087032e7a823f6c63a64dac951e0f4843bc4667;p=rust-lightning

Merge pull request #620 from TheBlueMatt/2020-05-pre-bindings-cleanups

Pre-C Bindings Cleanup
---

2087032e7a823f6c63a64dac951e0f4843bc4667
diff --cc lightning/src/ln/peer_handler.rs
index e75c2c96e,009fa73f9..12d728466
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@@ -10,9 -10,9 +10,9 @@@ use bitcoin::secp256k1::key::{SecretKey
  
  use ln::features::InitFeatures;
  use ln::msgs;
- use ln::msgs::ChannelMessageHandler;
+ use ln::msgs::{ChannelMessageHandler, RoutingMessageHandler};
  use ln::channelmanager::{SimpleArcChannelManager, SimpleRefChannelManager};
 -use util::ser::VecWriter;
 +use util::ser::{VecWriter, Writeable};
  use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
  use ln::wire;
  use ln::wire::Encode;