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

Pre-C Bindings Cleanup

diff --cc fuzz/src/chanmon_consistency.rs
Simple merge

diff --cc fuzz/src/full_stack.rs
Simple merge

diff --cc lightning/src/chain/keysinterface.rs
Simple merge

diff --cc lightning/src/ln/chan_utils.rs
Simple merge

diff --cc lightning/src/ln/channel.rs
Simple merge

diff --cc lightning/src/ln/channelmonitor.rs
Simple merge

diff --cc lightning/src/ln/functional_tests.rs
Simple merge

diff --cc lightning/src/ln/peer_handler.rs
index e75c2c96e98c9e28dc24170f379c58bb42b6c4ac,009fa73f939e21ace76acb54acd205e56b2fa70a..12d7284661dee0c68c2fc377d9d6451141232a00
--- 1/lightning/src/ln/peer_handler.rs
--- 2/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;

diff --cc lightning/src/util/macro_logger.rs
Simple merge

diff --cc lightning/src/util/test_utils.rs
Simple merge