fix compile issues

Author: SWvheerden

src/ln/peer_handler.rs

@@ -9,7 +9,6 @@
 use secp256k1::key::{SecretKey,PublicKey};
 
 use ln::msgs;
-use ln::msgs::NetworkAPI;
 use util::ser::{Writeable, Writer, Readable};
 use ln::peer_channel_encryptor::{PeerChannelEncryptor,NextNoiseStep};
 use util::byte_utils;
@@ -516,8 +515,8 @@ impl<Descriptor: SocketDescriptor> PeerManager<Descriptor> {
 													if self.initial_syncs_sent.load(Ordering::Acquire) < INITIAL_SYNCS_TO_SEND {
 														self.initial_syncs_sent.fetch_add(1, Ordering::AcqRel);
 														local_features.set_initial_routing_sync();
-														let channel_messages = self.message_handler.route_handler.get_all_channel_announcements();
-														let node_messages = self.message_handler.route_handler.get_all_node_announcements();
+														let channel_messages = self.message_handler.route_handler.get_all_channel_announcements().unwrap();
+														let node_messages = self.message_handler.route_handler.get_all_node_announcements().unwrap();
 														for message in channel_messages.iter(){
 															encode_and_send_msg!(message, 256);
 														}

src/ln/router.rs

@@ -440,10 +440,10 @@ impl RoutingMessageHandler for Router {
 
 impl NetworkTopology for Router {
 	fn get_all_channel_announcements(&self)-> Result<Vec<msgs::ChannelAnnouncement>, std::fmt::Error>{
-		let result = Vec::new();
+		let mut result = Vec::new();
 		let network = self.network_map.read().unwrap();
 		for (key, value) in network.channels.iter(){
-			if let Some(i) = value.announcement_message{
+			if let Some(ref i) = value.announcement_message{
 			result.push(i.clone());
 			}
 		}
@@ -475,10 +475,10 @@ impl NetworkTopology for Router {
 	}
 	///This function generates a vec of all node_annoucment messages for all nodes it known of
 	fn get_all_node_announcements(&self)-> Result<Vec<msgs::NodeAnnouncement>, std::fmt::Error>{
-		let result = Vec::new();
+		let mut result = Vec::new();
 		let network = self.network_map.read().unwrap();
 		for (key, value) in network.nodes.iter(){
-			if let Some(i) = value.announcement_message{
+			if let Some(ref i) = value.announcement_message{
 				result.push(i.clone());
 			}
 			/*let msg_contents = msgs::UnsignedNodeAnnouncement{