]> git.bitcoin.ninja Git - rust-lightning/commitdiff
`rustfmt`: `fuzz/src/router.rs`
authorElias Rohrer <dev@tnull.de>
Thu, 6 Jun 2024 11:17:20 +0000 (13:17 +0200)
committerElias Rohrer <dev@tnull.de>
Fri, 7 Jun 2024 18:42:36 +0000 (20:42 +0200)
fuzz/src/router.rs
rustfmt_excluded_files

index 2a36d890936790dc1367ce2cc090c3cd16062cf1..a4002682111cd4cbd249bb29644fa9705fb8b085 100644 (file)
@@ -14,57 +14,59 @@ use bitcoin::blockdata::transaction::TxOut;
 
 use lightning::blinded_path::{BlindedHop, BlindedPath, IntroductionNode};
 use lightning::chain::transaction::OutPoint;
-use lightning::ln::ChannelId;
-use lightning::ln::channel_state::{ChannelDetails, ChannelCounterparty, ChannelShutdownState};
+use lightning::ln::channel_state::{ChannelCounterparty, ChannelDetails, ChannelShutdownState};
 use lightning::ln::channelmanager;
 use lightning::ln::features::{BlindedHopFeatures, Bolt12InvoiceFeatures};
 use lightning::ln::msgs;
+use lightning::ln::ChannelId;
 use lightning::offers::invoice::BlindedPayInfo;
 use lightning::routing::gossip::{NetworkGraph, RoutingFees};
+use lightning::routing::router::{
+       find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters,
+};
+use lightning::routing::scoring::{
+       ProbabilisticScorer, ProbabilisticScoringDecayParameters, ProbabilisticScoringFeeParameters,
+};
 use lightning::routing::utxo::{UtxoFuture, UtxoLookup, UtxoLookupError, UtxoResult};
-use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
-use lightning::routing::scoring::{ProbabilisticScorer, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters};
 use lightning::util::config::UserConfig;
 use lightning::util::hash_tables::*;
 use lightning::util::ser::Readable;
 
 use bitcoin::hashes::Hash;
-use bitcoin::secp256k1::PublicKey;
 use bitcoin::network::Network;
+use bitcoin::secp256k1::PublicKey;
 
 use crate::utils::test_logger;
 
 use std::convert::TryInto;
-use std::sync::Arc;
 use std::sync::atomic::{AtomicUsize, Ordering};
+use std::sync::Arc;
 
 #[inline]
 pub fn slice_to_be16(v: &[u8]) -> u16 {
-       ((v[0] as u16) << 8*1) |
-       ((v[1] as u16) << 8*0)
+       ((v[0] as u16) << 8 * 1) | ((v[1] as u16) << 8 * 0)
 }
 
 #[inline]
 pub fn slice_to_be32(v: &[u8]) -> u32 {
-       ((v[0] as u32) << 8*3) |
-       ((v[1] as u32) << 8*2) |
-       ((v[2] as u32) << 8*1) |
-       ((v[3] as u32) << 8*0)
+       ((v[0] as u32) << 8 * 3)
+               | ((v[1] as u32) << 8 * 2)
+               | ((v[2] as u32) << 8 * 1)
+               | ((v[3] as u32) << 8 * 0)
 }
 
 #[inline]
 pub fn slice_to_be64(v: &[u8]) -> u64 {
-       ((v[0] as u64) << 8*7) |
-       ((v[1] as u64) << 8*6) |
-       ((v[2] as u64) << 8*5) |
-       ((v[3] as u64) << 8*4) |
-       ((v[4] as u64) << 8*3) |
-       ((v[5] as u64) << 8*2) |
-       ((v[6] as u64) << 8*1) |
-       ((v[7] as u64) << 8*0)
+       ((v[0] as u64) << 8 * 7)
+               | ((v[1] as u64) << 8 * 6)
+               | ((v[2] as u64) << 8 * 5)
+               | ((v[3] as u64) << 8 * 4)
+               | ((v[4] as u64) << 8 * 3)
+               | ((v[5] as u64) << 8 * 2)
+               | ((v[6] as u64) << 8 * 1)
+               | ((v[7] as u64) << 8 * 0)
 }
 
-
 struct InputData {
        data: Vec<u8>,
        read_pos: AtomicUsize,
@@ -93,7 +95,9 @@ struct FuzzChainSource<'a, 'b, Out: test_logger::Output> {
 impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
        fn get_utxo(&self, _chain_hash: &ChainHash, _short_channel_id: u64) -> UtxoResult {
                let input_slice = self.input.get_slice(2);
-               if input_slice.is_none() { return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx)); }
+               if input_slice.is_none() {
+                       return UtxoResult::Sync(Err(UtxoLookupError::UnknownTx));
+               }
                let input_slice = input_slice.unwrap();
                let txo_res = TxOut {
                        value: Amount::from_sat(if input_slice[0] % 2 == 0 { 1_000_000 } else { 1_000 }),
@@ -122,17 +126,14 @@ impl<Out: test_logger::Output> UtxoLookup for FuzzChainSource<'_, '_, Out> {
 
 #[inline]
 pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
-       let input = Arc::new(InputData {
-               data: data.to_vec(),
-               read_pos: AtomicUsize::new(0),
-       });
+       let input = Arc::new(InputData { data: data.to_vec(), read_pos: AtomicUsize::new(0) });
        macro_rules! get_slice_nonadvancing {
                ($len: expr) => {
                        match input.get_slice_nonadvancing($len as usize) {
                                Some(slice) => slice,
                                None => return,
                        }
-               }
+               };
        }
        macro_rules! get_slice {
                ($len: expr) => {
@@ -140,7 +141,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                Some(slice) => slice,
                                None => return,
                        }
-               }
+               };
        }
 
        macro_rules! decode_msg {
@@ -160,18 +161,16 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                        msgs::DecodeError::Io(e) => panic!("{:?}", e),
                                        msgs::DecodeError::UnsupportedCompression => return,
                                        msgs::DecodeError::DangerousValue => return,
-                               }
+                               },
                        }
-               }}
+               }};
        }
 
        macro_rules! decode_msg_with_len16 {
-               ($MsgType: path, $excess: expr) => {
-                       {
-                               let extra_len = slice_to_be16(get_slice_nonadvancing!(2));
-                               decode_msg!($MsgType, 2 + (extra_len as usize) + $excess)
-                       }
-               }
+               ($MsgType: path, $excess: expr) => {{
+                       let extra_len = slice_to_be16(get_slice_nonadvancing!(2));
+                       decode_msg!($MsgType, 2 + (extra_len as usize) + $excess)
+               }};
        }
 
        macro_rules! get_pubkey_from_node_id {
@@ -180,7 +179,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                Ok(pk) => pk,
                                Err(_) => return,
                        }
-               }
+               };
        }
 
        macro_rules! get_pubkey {
@@ -189,17 +188,14 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                Ok(key) => key,
                                Err(_) => return,
                        }
-               }
+               };
        }
 
        let logger = test_logger::TestLogger::new("".to_owned(), out);
 
        let our_pubkey = get_pubkey!();
        let net_graph = NetworkGraph::new(Network::Bitcoin, &logger);
-       let chain_source = FuzzChainSource {
-               input: Arc::clone(&input),
-               net_graph: &net_graph,
-       };
+       let chain_source = FuzzChainSource { input: Arc::clone(&input), net_graph: &net_graph };
 
        let mut node_pks = new_hash_map();
        let mut scid = 42;
@@ -211,32 +207,41 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                count => {
                                        for _ in 0..count {
                                                scid += 1;
-                                               let (rnid, _) =
-                                                       node_pks.iter().skip(u16::from_be_bytes(get_slice!(2).try_into().unwrap()) as usize % node_pks.len()).next().unwrap();
+                                               let skip = u16::from_be_bytes(get_slice!(2).try_into().unwrap()) as usize
+                                                       % node_pks.len();
+                                               let (rnid, _) = node_pks.iter().skip(skip).next().unwrap();
                                                let capacity = u64::from_be_bytes(get_slice!(8).try_into().unwrap());
                                                $first_hops_vec.push(ChannelDetails {
                                                        channel_id: ChannelId::new_zero(),
                                                        counterparty: ChannelCounterparty {
                                                                node_id: *rnid,
-                                                               features: channelmanager::provided_init_features(&UserConfig::default()),
+                                                               features: channelmanager::provided_init_features(
+                                                                       &UserConfig::default(),
+                                                               ),
                                                                unspendable_punishment_reserve: 0,
                                                                forwarding_info: None,
                                                                outbound_htlc_minimum_msat: None,
                                                                outbound_htlc_maximum_msat: None,
                                                        },
-                                                       funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
+                                                       funding_txo: Some(OutPoint {
+                                                               txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(),
+                                                               index: 0,
+                                                       }),
                                                        channel_type: None,
                                                        short_channel_id: Some(scid),
                                                        inbound_scid_alias: None,
                                                        outbound_scid_alias: None,
                                                        channel_value_satoshis: capacity,
-                                                       user_channel_id: 0, inbound_capacity_msat: 0,
+                                                       user_channel_id: 0,
+                                                       inbound_capacity_msat: 0,
                                                        unspendable_punishment_reserve: None,
                                                        confirmations_required: None,
                                                        confirmations: None,
                                                        force_close_spend_delay: None,
-                                                       is_outbound: true, is_channel_ready: true,
-                                                       is_usable: true, is_public: true,
+                                                       is_outbound: true,
+                                                       is_channel_ready: true,
+                                                       is_usable: true,
+                                                       is_public: true,
                                                        balance_msat: 0,
                                                        outbound_capacity_msat: capacity.saturating_mul(1000),
                                                        next_outbound_htlc_limit_msat: capacity.saturating_mul(1000),
@@ -253,7 +258,7 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                        Some(&$first_hops_vec[..])
                                },
                        }
-               }
+               };
        }
 
        macro_rules! last_hops {
@@ -261,8 +266,8 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                        let count = get_slice!(1)[0];
                        for _ in 0..count {
                                scid += 1;
-                               let (rnid, _) =
-                                       node_pks.iter().skip(slice_to_be16(get_slice!(2)) as usize % node_pks.len()).next().unwrap();
+                               let skip = slice_to_be16(get_slice!(2)) as usize % node_pks.len();
+                               let (rnid, _) = node_pks.iter().skip(skip).next().unwrap();
                                $last_hops.push(RouteHint(vec![RouteHintHop {
                                        src_node_id: *rnid,
                                        short_channel_id: scid,
@@ -275,30 +280,47 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                        htlc_maximum_msat: None,
                                }]));
                        }
-               }
+               };
        }
 
        macro_rules! find_routes {
                ($first_hops: expr, $node_pks: expr, $route_params: expr) => {
-                       let scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &net_graph, &logger);
+                       let scorer = ProbabilisticScorer::new(
+                               ProbabilisticScoringDecayParameters::default(),
+                               &net_graph,
+                               &logger,
+                       );
                        let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
                        for (target, ()) in $node_pks {
                                let final_value_msat = slice_to_be64(get_slice!(8));
                                let final_cltv_expiry_delta = slice_to_be32(get_slice!(4));
                                let route_params = $route_params(final_value_msat, final_cltv_expiry_delta, target);
-                               let _ = find_route(&our_pubkey, &route_params, &net_graph,
-                                       $first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
-                                       &logger, &scorer, &ProbabilisticScoringFeeParameters::default(), &random_seed_bytes);
+                               let _ = find_route(
+                                       &our_pubkey,
+                                       &route_params,
+                                       &net_graph,
+                                       $first_hops
+                                               .map(|c| c.iter().collect::<Vec<_>>())
+                                               .as_ref()
+                                               .map(|a| a.as_slice()),
+                                       &logger,
+                                       &scorer,
+                                       &ProbabilisticScoringFeeParameters::default(),
+                                       &random_seed_bytes,
+                               );
                        }
-               }
+               };
        }
 
        loop {
                match get_slice!(1)[0] {
                        0 => {
                                let start_len = slice_to_be16(&get_slice_nonadvancing!(2)[0..2]) as usize;
-                               let addr_len = slice_to_be16(&get_slice_nonadvancing!(start_len+2 + 74)[start_len+2 + 72..start_len+2 + 74]);
-                               if addr_len > (37+1)*4 {
+                               let addr_len = slice_to_be16(
+                                       &get_slice_nonadvancing!(start_len + 2 + 74)
+                                               [start_len + 2 + 72..start_len + 2 + 74],
+                               );
+                               if addr_len > (37 + 1) * 4 {
                                        return;
                                }
                                let msg = decode_msg_with_len16!(msgs::UnsignedNodeAnnouncement, 288);
@@ -306,20 +328,26 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                let _ = net_graph.update_node_from_unsigned_announcement(&msg);
                        },
                        1 => {
-                               let msg = decode_msg_with_len16!(msgs::UnsignedChannelAnnouncement, 32+8+33*4);
+                               let msg =
+                                       decode_msg_with_len16!(msgs::UnsignedChannelAnnouncement, 32 + 8 + 33 * 4);
                                node_pks.insert(get_pubkey_from_node_id!(msg.node_id_1), ());
                                node_pks.insert(get_pubkey_from_node_id!(msg.node_id_2), ());
-                               let _ = net_graph.update_channel_from_unsigned_announcement::
-                                       <&FuzzChainSource<'_, '_, Out>>(&msg, &None);
+                               let _ = net_graph
+                                       .update_channel_from_unsigned_announcement::<&FuzzChainSource<'_, '_, Out>>(
+                                               &msg, &None,
+                                       );
                        },
                        2 => {
-                               let msg = decode_msg_with_len16!(msgs::UnsignedChannelAnnouncement, 32+8+33*4);
+                               let msg =
+                                       decode_msg_with_len16!(msgs::UnsignedChannelAnnouncement, 32 + 8 + 33 * 4);
                                node_pks.insert(get_pubkey_from_node_id!(msg.node_id_1), ());
                                node_pks.insert(get_pubkey_from_node_id!(msg.node_id_2), ());
-                               let _ = net_graph.update_channel_from_unsigned_announcement(&msg, &Some(&chain_source));
+                               let _ =
+                                       net_graph.update_channel_from_unsigned_announcement(&msg, &Some(&chain_source));
                        },
                        3 => {
-                               let _ = net_graph.update_channel_unsigned(&decode_msg!(msgs::UnsignedChannelUpdate, 72));
+                               let _ = net_graph
+                                       .update_channel_unsigned(&decode_msg!(msgs::UnsignedChannelUpdate, 72));
                        },
                        4 => {
                                let short_channel_id = slice_to_be64(get_slice!(8));
@@ -333,12 +361,18 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                let first_hops = first_hops!(first_hops_vec);
                                let mut last_hops = Vec::new();
                                last_hops!(last_hops);
-                               find_routes!(first_hops, node_pks.iter(), |final_amt, final_delta, target: &PublicKey| {
-                                       RouteParameters::from_payment_params_and_value(
-                                               PaymentParameters::from_node_id(*target, final_delta)
-                                                       .with_route_hints(last_hops.clone()).unwrap(),
-                                               final_amt)
-                               });
+                               find_routes!(
+                                       first_hops,
+                                       node_pks.iter(),
+                                       |final_amt, final_delta, target: &PublicKey| {
+                                               RouteParameters::from_payment_params_and_value(
+                                                       PaymentParameters::from_node_id(*target, final_delta)
+                                                               .with_route_hints(last_hops.clone())
+                                                               .unwrap(),
+                                                       final_amt,
+                                               )
+                                       }
+                               );
                        },
                        x => {
                                let mut first_hops_vec = Vec::new();
@@ -346,38 +380,47 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
                                let mut last_hops_unblinded = Vec::new();
                                last_hops!(last_hops_unblinded);
                                let dummy_pk = PublicKey::from_slice(&[2; 33]).unwrap();
-                               let last_hops: Vec<(BlindedPayInfo, BlindedPath)> = last_hops_unblinded.into_iter().map(|hint| {
-                                       let hop = &hint.0[0];
-                                       let payinfo = BlindedPayInfo {
-                                               fee_base_msat: hop.fees.base_msat,
-                                               fee_proportional_millionths: hop.fees.proportional_millionths,
-                                               htlc_minimum_msat: hop.htlc_minimum_msat.unwrap(),
-                                               htlc_maximum_msat: hop.htlc_minimum_msat.unwrap().saturating_mul(100),
-                                               cltv_expiry_delta: hop.cltv_expiry_delta,
-                                               features: BlindedHopFeatures::empty(),
-                                       };
-                                       let num_blinded_hops = x % 250;
-                                       let mut blinded_hops = Vec::new();
-                                       for _ in 0..num_blinded_hops {
-                                               blinded_hops.push(BlindedHop {
-                                                       blinded_node_id: dummy_pk,
-                                                       encrypted_payload: Vec::new()
-                                               });
-                                       }
-                                       (payinfo, BlindedPath {
-                                               introduction_node: IntroductionNode::NodeId(hop.src_node_id),
-                                               blinding_point: dummy_pk,
-                                               blinded_hops,
+                               let last_hops: Vec<(BlindedPayInfo, BlindedPath)> = last_hops_unblinded
+                                       .into_iter()
+                                       .map(|hint| {
+                                               let hop = &hint.0[0];
+                                               let payinfo = BlindedPayInfo {
+                                                       fee_base_msat: hop.fees.base_msat,
+                                                       fee_proportional_millionths: hop.fees.proportional_millionths,
+                                                       htlc_minimum_msat: hop.htlc_minimum_msat.unwrap(),
+                                                       htlc_maximum_msat: hop.htlc_minimum_msat.unwrap().saturating_mul(100),
+                                                       cltv_expiry_delta: hop.cltv_expiry_delta,
+                                                       features: BlindedHopFeatures::empty(),
+                                               };
+                                               let num_blinded_hops = x % 250;
+                                               let mut blinded_hops = Vec::new();
+                                               for _ in 0..num_blinded_hops {
+                                                       blinded_hops.push(BlindedHop {
+                                                               blinded_node_id: dummy_pk,
+                                                               encrypted_payload: Vec::new(),
+                                                       });
+                                               }
+                                               (
+                                                       payinfo,
+                                                       BlindedPath {
+                                                               introduction_node: IntroductionNode::NodeId(hop.src_node_id),
+                                                               blinding_point: dummy_pk,
+                                                               blinded_hops,
+                                                       },
+                                               )
                                        })
-                               }).collect();
+                                       .collect();
                                let mut features = Bolt12InvoiceFeatures::empty();
                                features.set_basic_mpp_optional();
                                find_routes!(first_hops, [(dummy_pk, ())].iter(), |final_amt, _, _| {
-                                       RouteParameters::from_payment_params_and_value(PaymentParameters::blinded(last_hops.clone())
-                                               .with_bolt12_features(features.clone()).unwrap(),
-                                       final_amt)
+                                       RouteParameters::from_payment_params_and_value(
+                                               PaymentParameters::blinded(last_hops.clone())
+                                                       .with_bolt12_features(features.clone())
+                                                       .unwrap(),
+                                               final_amt,
+                                       )
                                });
-                       }
+                       },
                }
        }
 }
index c27a84e70ef460d9c8eabafa4481597ba3fb816e..2e8aa253ddcfd6a83608233237a52aca375fde6c 100644 (file)
@@ -1,7 +1,6 @@
 ./bench/benches/bench.rs
 ./fuzz/src/chanmon_consistency.rs
 ./fuzz/src/full_stack.rs
-./fuzz/src/router.rs
 ./fuzz/src/utils/mod.rs
 ./fuzz/src/utils/test_logger.rs
 ./fuzz/src/utils/test_persister.rs