From: Matt Corallo Date: Sat, 21 Nov 2020 17:09:40 +0000 (-0500) Subject: [fuzz] Reduce overuse of macros/Arcs in chanmon_consistency X-Git-Tag: v0.0.12~5^2~2 X-Git-Url: http://git.bitcoin.ninja/?a=commitdiff_plain;h=943153530dbd5d002f7193d601b4ba7ad7f6ab60;p=rust-lightning [fuzz] Reduce overuse of macros/Arcs in chanmon_consistency In previous versions of related commits, the macros in chanmon_consistency ended up blowing up rustc a bit resulting in 20+GB memory usage and long compile times. Shorter function bodies by avoiding macros where possible fix this. --- diff --git a/fuzz/src/chanmon_consistency.rs b/fuzz/src/chanmon_consistency.rs index 594a9c32c..8a17719f9 100644 --- a/fuzz/src/chanmon_consistency.rs +++ b/fuzz/src/chanmon_consistency.rs @@ -227,6 +227,52 @@ fn check_payment_err(send_err: PaymentSendFailure) { } } +type ChanMan = ChannelManager, Arc, Arc, Arc, Arc>; + +#[inline] +fn send_payment(source: &ChanMan, dest: &ChanMan, dest_chan_id: u64, amt: u64, payment_id: &mut u8) -> bool { + let payment_hash = Sha256::hash(&[*payment_id; 1]); + *payment_id = payment_id.wrapping_add(1); + if let Err(err) = source.send_payment(&Route { + paths: vec![vec![RouteHop { + pubkey: dest.get_our_node_id(), + node_features: NodeFeatures::empty(), + short_channel_id: dest_chan_id, + channel_features: ChannelFeatures::empty(), + fee_msat: amt, + cltv_expiry_delta: 200, + }]], + }, PaymentHash(payment_hash.into_inner()), &None) { + check_payment_err(err); + false + } else { true } +} +#[inline] +fn send_hop_payment(source: &ChanMan, middle: &ChanMan, middle_chan_id: u64, dest: &ChanMan, dest_chan_id: u64, amt: u64, payment_id: &mut u8) -> bool { + let payment_hash = Sha256::hash(&[*payment_id; 1]); + *payment_id = payment_id.wrapping_add(1); + if let Err(err) = source.send_payment(&Route { + paths: vec![vec![RouteHop { + pubkey: middle.get_our_node_id(), + node_features: NodeFeatures::empty(), + short_channel_id: middle_chan_id, + channel_features: ChannelFeatures::empty(), + fee_msat: 50000, + cltv_expiry_delta: 100, + },RouteHop { + pubkey: dest.get_our_node_id(), + node_features: NodeFeatures::empty(), + short_channel_id: dest_chan_id, + channel_features: ChannelFeatures::empty(), + fee_msat: amt, + cltv_expiry_delta: 200, + }]], + }, PaymentHash(payment_hash.into_inner()), &None) { + check_payment_err(err); + false + } else { true } +} + #[inline] pub fn do_test(data: &[u8], out: Out) { let fee_est = Arc::new(FuzzEstimator{}); @@ -242,7 +288,7 @@ pub fn do_test(data: &[u8], out: Out) { config.channel_options.fee_proportional_millionths = 0; config.channel_options.announced_channel = true; config.peer_channel_config_limits.min_dust_limit_satoshis = 0; - (Arc::new(ChannelManager::new(Network::Bitcoin, fee_est.clone(), monitor.clone(), broadcast.clone(), Arc::clone(&logger), keys_manager.clone(), config, 0)), + (ChannelManager::new(Network::Bitcoin, fee_est.clone(), monitor.clone(), broadcast.clone(), Arc::clone(&logger), keys_manager.clone(), config, 0), monitor) } } } @@ -279,7 +325,7 @@ pub fn do_test(data: &[u8], out: Out) { channel_monitors: monitor_refs, }; - (<(BlockHash, ChannelManager, Arc, Arc, Arc, Arc>)>::read(&mut Cursor::new(&$ser.0), read_args).expect("Failed to read manager").1, chain_monitor) + (<(BlockHash, ChanMan)>::read(&mut Cursor::new(&$ser.0), read_args).expect("Failed to read manager").1, chain_monitor) } } } @@ -389,9 +435,9 @@ pub fn do_test(data: &[u8], out: Out) { // 3 nodes is enough to hit all the possible cases, notably unknown-source-unknown-dest // forwarding. - let (mut node_a, mut monitor_a) = make_node!(0); - let (mut node_b, mut monitor_b) = make_node!(1); - let (mut node_c, mut monitor_c) = make_node!(2); + let (node_a, mut monitor_a) = make_node!(0); + let (node_b, mut monitor_b) = make_node!(1); + let (node_c, mut monitor_c) = make_node!(2); let mut nodes = [node_a, node_b, node_c]; @@ -407,7 +453,7 @@ pub fn do_test(data: &[u8], out: Out) { let chan_a = nodes[0].list_usable_channels()[0].short_channel_id.unwrap(); let chan_b = nodes[2].list_usable_channels()[0].short_channel_id.unwrap(); - let mut payment_id = 0; + let mut payment_id: u8 = 0; let mut chan_a_disconnected = false; let mut chan_b_disconnected = false; @@ -445,47 +491,6 @@ pub fn do_test(data: &[u8], out: Out) { } loop { - macro_rules! send_payment { - ($source: expr, $dest: expr, $amt: expr) => { { - let payment_hash = Sha256::hash(&[payment_id; 1]); - payment_id = payment_id.wrapping_add(1); - if let Err(err) = $source.send_payment(&Route { - paths: vec![vec![RouteHop { - pubkey: $dest.0.get_our_node_id(), - node_features: NodeFeatures::empty(), - short_channel_id: $dest.1, - channel_features: ChannelFeatures::empty(), - fee_msat: $amt, - cltv_expiry_delta: 200, - }]], - }, PaymentHash(payment_hash.into_inner()), &None) { - check_payment_err(err); - } - } }; - ($source: expr, $middle: expr, $dest: expr, $amt: expr) => { { - let payment_hash = Sha256::hash(&[payment_id; 1]); - payment_id = payment_id.wrapping_add(1); - if let Err(err) = $source.send_payment(&Route { - paths: vec![vec![RouteHop { - pubkey: $middle.0.get_our_node_id(), - node_features: NodeFeatures::empty(), - short_channel_id: $middle.1, - channel_features: ChannelFeatures::empty(), - fee_msat: 50000, - cltv_expiry_delta: 100, - },RouteHop { - pubkey: $dest.0.get_our_node_id(), - node_features: NodeFeatures::empty(), - short_channel_id: $dest.1, - channel_features: ChannelFeatures::empty(), - fee_msat: $amt, - cltv_expiry_delta: 200, - }]], - }, PaymentHash(payment_hash.into_inner()), &None) { - check_payment_err(err); - } - } } - } macro_rules! send_payment_with_secret { ($source: expr, $middle: expr, $dest: expr) => { { let payment_hash = Sha256::hash(&[payment_id; 1]); @@ -783,8 +788,7 @@ pub fn do_test(data: &[u8], out: Out) { drain_msg_events_on_disconnect!(0); } let (new_node_a, new_monitor_a) = reload_node!(node_a_ser, 0, monitor_a); - node_a = Arc::new(new_node_a); - nodes[0] = node_a.clone(); + nodes[0] = new_node_a; monitor_a = new_monitor_a; }, 0x1d => { @@ -801,8 +805,7 @@ pub fn do_test(data: &[u8], out: Out) { bc_events.clear(); } let (new_node_b, new_monitor_b) = reload_node!(node_b_ser, 1, monitor_b); - node_b = Arc::new(new_node_b); - nodes[1] = node_b.clone(); + nodes[1] = new_node_b; monitor_b = new_monitor_b; }, 0x1e => { @@ -812,70 +815,69 @@ pub fn do_test(data: &[u8], out: Out) { drain_msg_events_on_disconnect!(2); } let (new_node_c, new_monitor_c) = reload_node!(node_c_ser, 2, monitor_c); - node_c = Arc::new(new_node_c); - nodes[2] = node_c.clone(); + nodes[2] = new_node_c; monitor_c = new_monitor_c; }, // 1/10th the channel size: - 0x20 => send_payment!(nodes[0], (&nodes[1], chan_a), 10_000_000), - 0x21 => send_payment!(nodes[1], (&nodes[0], chan_a), 10_000_000), - 0x22 => send_payment!(nodes[1], (&nodes[2], chan_b), 10_000_000), - 0x23 => send_payment!(nodes[2], (&nodes[1], chan_b), 10_000_000), - 0x24 => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 10_000_000), - 0x25 => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 10_000_000), - - 0x26 => send_payment_with_secret!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b)), - 0x27 => send_payment_with_secret!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a)), - - 0x28 => send_payment!(nodes[0], (&nodes[1], chan_a), 1_000_000), - 0x29 => send_payment!(nodes[1], (&nodes[0], chan_a), 1_000_000), - 0x2a => send_payment!(nodes[1], (&nodes[2], chan_b), 1_000_000), - 0x2b => send_payment!(nodes[2], (&nodes[1], chan_b), 1_000_000), - 0x2c => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 1_000_000), - 0x2d => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 1_000_000), - - 0x30 => send_payment!(nodes[0], (&nodes[1], chan_a), 100_000), - 0x31 => send_payment!(nodes[1], (&nodes[0], chan_a), 100_000), - 0x32 => send_payment!(nodes[1], (&nodes[2], chan_b), 100_000), - 0x33 => send_payment!(nodes[2], (&nodes[1], chan_b), 100_000), - 0x34 => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 100_000), - 0x35 => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 100_000), - - 0x38 => send_payment!(nodes[0], (&nodes[1], chan_a), 10_000), - 0x39 => send_payment!(nodes[1], (&nodes[0], chan_a), 10_000), - 0x3a => send_payment!(nodes[1], (&nodes[2], chan_b), 10_000), - 0x3b => send_payment!(nodes[2], (&nodes[1], chan_b), 10_000), - 0x3c => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 10_000), - 0x3d => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 10_000), - - 0x40 => send_payment!(nodes[0], (&nodes[1], chan_a), 1_000), - 0x41 => send_payment!(nodes[1], (&nodes[0], chan_a), 1_000), - 0x42 => send_payment!(nodes[1], (&nodes[2], chan_b), 1_000), - 0x43 => send_payment!(nodes[2], (&nodes[1], chan_b), 1_000), - 0x44 => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 1_000), - 0x45 => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 1_000), - - 0x48 => send_payment!(nodes[0], (&nodes[1], chan_a), 100), - 0x49 => send_payment!(nodes[1], (&nodes[0], chan_a), 100), - 0x4a => send_payment!(nodes[1], (&nodes[2], chan_b), 100), - 0x4b => send_payment!(nodes[2], (&nodes[1], chan_b), 100), - 0x4c => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 100), - 0x4d => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 100), - - 0x50 => send_payment!(nodes[0], (&nodes[1], chan_a), 10), - 0x51 => send_payment!(nodes[1], (&nodes[0], chan_a), 10), - 0x52 => send_payment!(nodes[1], (&nodes[2], chan_b), 10), - 0x53 => send_payment!(nodes[2], (&nodes[1], chan_b), 10), - 0x54 => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 10), - 0x55 => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 10), - - 0x58 => send_payment!(nodes[0], (&nodes[1], chan_a), 1), - 0x59 => send_payment!(nodes[1], (&nodes[0], chan_a), 1), - 0x5a => send_payment!(nodes[1], (&nodes[2], chan_b), 1), - 0x5b => send_payment!(nodes[2], (&nodes[1], chan_b), 1), - 0x5c => send_payment!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b), 1), - 0x5d => send_payment!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a), 1), + 0x20 => { send_payment(&nodes[0], &nodes[1], chan_a, 10_000_000, &mut payment_id); }, + 0x21 => { send_payment(&nodes[1], &nodes[0], chan_a, 10_000_000, &mut payment_id); }, + 0x22 => { send_payment(&nodes[1], &nodes[2], chan_b, 10_000_000, &mut payment_id); }, + 0x23 => { send_payment(&nodes[2], &nodes[1], chan_b, 10_000_000, &mut payment_id); }, + 0x24 => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 10_000_000, &mut payment_id); }, + 0x25 => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 10_000_000, &mut payment_id); }, + + 0x26 => { send_payment_with_secret!(nodes[0], (&nodes[1], chan_a), (&nodes[2], chan_b)); }, + 0x27 => { send_payment_with_secret!(nodes[2], (&nodes[1], chan_b), (&nodes[0], chan_a)); }, + + 0x28 => { send_payment(&nodes[0], &nodes[1], chan_a, 1_000_000, &mut payment_id); }, + 0x29 => { send_payment(&nodes[1], &nodes[0], chan_a, 1_000_000, &mut payment_id); }, + 0x2a => { send_payment(&nodes[1], &nodes[2], chan_b, 1_000_000, &mut payment_id); }, + 0x2b => { send_payment(&nodes[2], &nodes[1], chan_b, 1_000_000, &mut payment_id); }, + 0x2c => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 1_000_000, &mut payment_id); }, + 0x2d => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 1_000_000, &mut payment_id); }, + + 0x30 => { send_payment(&nodes[0], &nodes[1], chan_a, 100_000, &mut payment_id); }, + 0x31 => { send_payment(&nodes[1], &nodes[0], chan_a, 100_000, &mut payment_id); }, + 0x32 => { send_payment(&nodes[1], &nodes[2], chan_b, 100_000, &mut payment_id); }, + 0x33 => { send_payment(&nodes[2], &nodes[1], chan_b, 100_000, &mut payment_id); }, + 0x34 => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 100_000, &mut payment_id); }, + 0x35 => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 100_000, &mut payment_id); }, + + 0x38 => { send_payment(&nodes[0], &nodes[1], chan_a, 10_000, &mut payment_id); }, + 0x39 => { send_payment(&nodes[1], &nodes[0], chan_a, 10_000, &mut payment_id); }, + 0x3a => { send_payment(&nodes[1], &nodes[2], chan_b, 10_000, &mut payment_id); }, + 0x3b => { send_payment(&nodes[2], &nodes[1], chan_b, 10_000, &mut payment_id); }, + 0x3c => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 10_000, &mut payment_id); }, + 0x3d => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 10_000, &mut payment_id); }, + + 0x40 => { send_payment(&nodes[0], &nodes[1], chan_a, 1_000, &mut payment_id); }, + 0x41 => { send_payment(&nodes[1], &nodes[0], chan_a, 1_000, &mut payment_id); }, + 0x42 => { send_payment(&nodes[1], &nodes[2], chan_b, 1_000, &mut payment_id); }, + 0x43 => { send_payment(&nodes[2], &nodes[1], chan_b, 1_000, &mut payment_id); }, + 0x44 => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 1_000, &mut payment_id); }, + 0x45 => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 1_000, &mut payment_id); }, + + 0x48 => { send_payment(&nodes[0], &nodes[1], chan_a, 100, &mut payment_id); }, + 0x49 => { send_payment(&nodes[1], &nodes[0], chan_a, 100, &mut payment_id); }, + 0x4a => { send_payment(&nodes[1], &nodes[2], chan_b, 100, &mut payment_id); }, + 0x4b => { send_payment(&nodes[2], &nodes[1], chan_b, 100, &mut payment_id); }, + 0x4c => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 100, &mut payment_id); }, + 0x4d => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 100, &mut payment_id); }, + + 0x50 => { send_payment(&nodes[0], &nodes[1], chan_a, 10, &mut payment_id); }, + 0x51 => { send_payment(&nodes[1], &nodes[0], chan_a, 10, &mut payment_id); }, + 0x52 => { send_payment(&nodes[1], &nodes[2], chan_b, 10, &mut payment_id); }, + 0x53 => { send_payment(&nodes[2], &nodes[1], chan_b, 10, &mut payment_id); }, + 0x54 => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 10, &mut payment_id); }, + 0x55 => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 10, &mut payment_id); }, + + 0x58 => { send_payment(&nodes[0], &nodes[1], chan_a, 1, &mut payment_id); }, + 0x59 => { send_payment(&nodes[1], &nodes[0], chan_a, 1, &mut payment_id); }, + 0x5a => { send_payment(&nodes[1], &nodes[2], chan_b, 1, &mut payment_id); }, + 0x5b => { send_payment(&nodes[2], &nodes[1], chan_b, 1, &mut payment_id); }, + 0x5c => { send_hop_payment(&nodes[0], &nodes[1], chan_a, &nodes[2], chan_b, 1, &mut payment_id); }, + 0x5d => { send_hop_payment(&nodes[2], &nodes[1], chan_b, &nodes[0], chan_a, 1, &mut payment_id); }, _ => test_return!(), }