From: Matt Corallo Date: Tue, 12 May 2020 01:12:23 +0000 (-0400) Subject: Fix some new indentation nits X-Git-Tag: v0.0.12~66^2 X-Git-Url: http://git.bitcoin.ninja/index.cgi?p=rust-lightning;a=commitdiff_plain;h=b1c80970e90ca223a67ea26245a2de7262242ccc Fix some new indentation nits --- diff --git a/fuzz/src/router.rs b/fuzz/src/router.rs index dbf5ad88..f388399a 100644 --- a/fuzz/src/router.rs +++ b/fuzz/src/router.rs @@ -221,7 +221,8 @@ pub fn do_test(data: &[u8], out: Out) { fees: RoutingFees { base_msat: slice_to_be32(get_slice!(4)), proportional_millionths: slice_to_be32(get_slice!(4)), - }, cltv_expiry_delta: slice_to_be16(get_slice!(2)), + }, + cltv_expiry_delta: slice_to_be16(get_slice!(2)), htlc_minimum_msat: slice_to_be64(get_slice!(8)), }); } diff --git a/lightning/src/ln/functional_test_utils.rs b/lightning/src/ln/functional_test_utils.rs index e4009cbf..4be866ff 100644 --- a/lightning/src/ln/functional_test_utils.rs +++ b/lightning/src/ln/functional_test_utils.rs @@ -104,8 +104,8 @@ impl<'a, 'b, 'c> Drop for Node<'a, 'b, 'c> { let network_graph_deser = ::read(&mut ::std::io::Cursor::new(&w.0)).unwrap(); assert!(network_graph_deser == *self.net_graph_msg_handler.network_graph.read().unwrap()); let net_graph_msg_handler = NetGraphMsgHandler::from_net_graph( - Arc::clone(&self.chain_monitor) as Arc, - Arc::clone(&self.logger) as Arc, RwLock::new(network_graph_deser) + Arc::clone(&self.chain_monitor) as Arc, + Arc::clone(&self.logger) as Arc, RwLock::new(network_graph_deser) ); let mut chan_progress = 0; loop { diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs index ab301bce..fedfad79 100644 --- a/lightning/src/routing/network_graph.rs +++ b/lightning/src/routing/network_graph.rs @@ -311,10 +311,10 @@ impl Writeable for RoutingFees { /// Information received in the latest node_announcement from this node. pub struct NodeAnnouncementInfo { /// Protocol features the node announced support for - pub features: NodeFeatures, + pub features: NodeFeatures, /// When the last known update to the node state was issued. /// Value is opaque, as set in the announcement. - pub last_update: u32, + pub last_update: u32, /// Color assigned to the node pub rgb: [u8; 3], /// Moniker assigned to the node. @@ -766,7 +766,7 @@ mod tests { use ln::features::{ChannelFeatures, NodeFeatures}; use routing::network_graph::{NetGraphMsgHandler, NetworkGraph}; use ln::msgs::{RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement, - UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate, HTLCFailChannelUpdate}; + UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate, HTLCFailChannelUpdate}; use util::test_utils; use util::logger::Logger; use util::ser::{Readable, Writeable}; @@ -845,7 +845,7 @@ mod tests { // Announce a channel to add a corresponding node. let unsigned_announcement = UnsignedChannelAnnouncement { features: ChannelFeatures::known(), - chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(), + chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(), short_channel_id: 0, node_id_1, node_id_2,