projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
f im an idiot
[rust-lightning]
/
fuzz
/
src
/
router.rs
diff --git
a/fuzz/src/router.rs
b/fuzz/src/router.rs
index d6aa97e42e7fc3939c327501017080b03e2552cb..761f7bddc864706d39ebb44739f3dd2082cd365c 100644
(file)
--- a/
fuzz/src/router.rs
+++ b/
fuzz/src/router.rs
@@
-13,22
+13,21
@@
use bitcoin::hash_types::BlockHash;
use lightning::chain;
use lightning::chain::transaction::OutPoint;
use lightning::chain;
use lightning::chain::transaction::OutPoint;
-use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
-use lightning::ln::features::InitFeatures;
+use lightning::ln::channelmanager::{self, ChannelDetails, ChannelCounterparty};
use lightning::ln::msgs;
use lightning::ln::msgs;
-use lightning::routing::
router::{find_route, Payee, RouteHint, RouteHintHop, RouteParameter
s};
-use lightning::routing::
scoring::Scorer
;
-use lightning::
util::logger::Logg
er;
+use lightning::routing::
gossip::{NetworkGraph, RoutingFee
s};
+use lightning::routing::
router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters}
;
+use lightning::
routing::scoring::FixedPenaltyScor
er;
use lightning::util::ser::Readable;
use lightning::util::ser::Readable;
-use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
use bitcoin::hashes::Hash;
use bitcoin::hashes::Hash;
-use bitcoin::secp256k1::
key::
PublicKey;
+use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;
-use utils::test_logger;
+use
crate::
utils::test_logger;
+use std::convert::TryInto;
use std::collections::HashSet;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
use std::collections::HashSet;
use std::sync::Arc;
use std::sync::atomic::{AtomicUsize, Ordering};
@@
-158,10
+157,10
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
}
}
}
}
- let logger
: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out)
);
+ let logger
= test_logger::TestLogger::new("".to_owned(), out
);
let our_pubkey = get_pubkey!();
let our_pubkey = get_pubkey!();
- let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash());
+ let net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash()
, &logger
);
let mut node_pks = HashSet::new();
let mut scid = 42;
let mut node_pks = HashSet::new();
let mut scid = 42;
@@
-195,7
+194,7
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
},
4 => {
let short_channel_id = slice_to_be64(get_slice!(8));
},
4 => {
let short_channel_id = slice_to_be64(get_slice!(8));
- net_graph.c
lose_channel_from_update
(short_channel_id, false);
+ net_graph.c
hannel_failed
(short_channel_id, false);
},
_ if node_pks.is_empty() => {},
_ => {
},
_ if node_pks.is_empty() => {},
_ => {
@@
-205,26
+204,37
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
count => {
for _ in 0..count {
scid += 1;
count => {
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 rnid = node_pks.iter().skip(u16::from_be_bytes(get_slice!(2).try_into().unwrap()) as usize % node_pks.len()).next().unwrap();
+ let capacity = u64::from_be_bytes(get_slice!(8).try_into().unwrap());
first_hops_vec.push(ChannelDetails {
channel_id: [0; 32],
counterparty: ChannelCounterparty {
node_id: *rnid,
first_hops_vec.push(ChannelDetails {
channel_id: [0; 32],
counterparty: ChannelCounterparty {
node_id: *rnid,
- features:
InitFeatures::known
(),
+ features:
channelmanager::provided_init_features
(),
unspendable_punishment_reserve: 0,
forwarding_info: None,
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),
short_channel_id: Some(scid),
- channel_value_satoshis: slice_to_be64(get_slice!(8)),
+ inbound_scid_alias: None,
+ outbound_scid_alias: None,
+ channel_value_satoshis: capacity,
user_channel_id: 0, inbound_capacity_msat: 0,
unspendable_punishment_reserve: None,
confirmations_required: None,
user_channel_id: 0, inbound_capacity_msat: 0,
unspendable_punishment_reserve: None,
confirmations_required: None,
+ confirmations: None,
force_close_spend_delay: None,
force_close_spend_delay: None,
- is_outbound: true, is_
funding_locked
: true,
+ is_outbound: true, is_
channel_ready
: true,
is_usable: true, is_public: true,
balance_msat: 0,
is_usable: true, is_public: true,
balance_msat: 0,
- outbound_capacity_msat: 0,
+ outbound_capacity_msat: capacity.saturating_mul(1000),
+ next_outbound_htlc_limit_msat: capacity.saturating_mul(1000),
+ inbound_htlc_minimum_msat: None,
+ inbound_htlc_maximum_msat: None,
+ config: None,
});
}
Some(&first_hops_vec[..])
});
}
Some(&first_hops_vec[..])
@@
-249,16
+259,17
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
}]));
}
}
}]));
}
}
- let scorer = Scorer::with_fixed_penalty(0);
+ let scorer = FixedPenaltyScorer::with_penalty(0);
+ let random_seed_bytes: [u8; 32] = [get_slice!(1)[0]; 32];
for target in node_pks.iter() {
for target in node_pks.iter() {
- let params = RouteParameters {
- pay
ee: Payee
::from_node_id(*target).with_route_hints(last_hops.clone()),
+ let
route_
params = RouteParameters {
+ pay
ment_params: PaymentParameters
::from_node_id(*target).with_route_hints(last_hops.clone()),
final_value_msat: slice_to_be64(get_slice!(8)),
final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
};
final_value_msat: slice_to_be64(get_slice!(8)),
final_cltv_expiry_delta: slice_to_be32(get_slice!(4)),
};
- let _ = find_route(&our_pubkey, ¶ms, &net_graph,
+ let _ = find_route(&our_pubkey, &
route_
params, &net_graph,
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
-
Arc::clone(&logger), &scorer
);
+
&logger, &scorer, &random_seed_bytes
);
}
},
}
}
},
}