projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
f tweak const names somewhat
[rust-lightning]
/
fuzz
/
src
/
router.rs
diff --git
a/fuzz/src/router.rs
b/fuzz/src/router.rs
index 671adcfda51ff48d3d1f6f18db8f5cda01426a14..6a207254ac9992e172d0fb194d7f6b76745e8d80 100644
(file)
--- a/
fuzz/src/router.rs
+++ b/
fuzz/src/router.rs
@@
-12,15
+12,20
@@
use bitcoin::blockdata::transaction::TxOut;
use bitcoin::hash_types::BlockHash;
use lightning::chain;
use bitcoin::hash_types::BlockHash;
use lightning::chain;
-use lightning::ln::channelmanager::ChannelDetails;
+use lightning::chain::transaction::OutPoint;
+use lightning::ln::channelmanager::{ChannelDetails, ChannelCounterparty};
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
use lightning::ln::features::InitFeatures;
use lightning::ln::msgs;
-use lightning::routing::router::{get_route, RouteHint};
+use lightning::routing::router::{get_route, RouteHint, RouteHintHop};
+use lightning::routing::scorer::Scorer;
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
+use bitcoin::hashes::Hash;
use bitcoin::secp256k1::key::PublicKey;
use bitcoin::secp256k1::key::PublicKey;
+use bitcoin::network::constants::Network;
+use bitcoin::blockdata::constants::genesis_block;
use utils::test_logger;
use utils::test_logger;
@@
-128,7
+133,8
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
msgs::DecodeError::InvalidValue => return,
msgs::DecodeError::BadLengthDescriptor => return,
msgs::DecodeError::ShortRead => panic!("We picked the length..."),
msgs::DecodeError::InvalidValue => return,
msgs::DecodeError::BadLengthDescriptor => return,
msgs::DecodeError::ShortRead => panic!("We picked the length..."),
- msgs::DecodeError::Io(e) => panic!(format!("{}", e)),
+ msgs::DecodeError::Io(e) => panic!("{:?}", e),
+ msgs::DecodeError::UnsupportedCompression => return,
}
}
}}
}
}
}}
@@
-155,7
+161,7
@@
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 our_pubkey = get_pubkey!();
let logger: Arc<dyn Logger> = Arc::new(test_logger::TestLogger::new("".to_owned(), out));
let our_pubkey = get_pubkey!();
- let
mut net_graph = NetworkGraph::new(
);
+ let
net_graph = NetworkGraph::new(genesis_block(Network::Bitcoin).header.block_hash()
);
let mut node_pks = HashSet::new();
let mut scid = 42;
let mut node_pks = HashSet::new();
let mut scid = 42;
@@
-202,26
+208,34
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
let rnid = node_pks.iter().skip(slice_to_be16(get_slice!(2))as usize % node_pks.len()).next().unwrap();
first_hops_vec.push(ChannelDetails {
channel_id: [0; 32],
let rnid = node_pks.iter().skip(slice_to_be16(get_slice!(2))as usize % node_pks.len()).next().unwrap();
first_hops_vec.push(ChannelDetails {
channel_id: [0; 32],
+ counterparty: ChannelCounterparty {
+ node_id: *rnid,
+ features: InitFeatures::known(),
+ unspendable_punishment_reserve: 0,
+ forwarding_info: None,
+ },
+ funding_txo: Some(OutPoint { txid: bitcoin::Txid::from_slice(&[0; 32]).unwrap(), index: 0 }),
short_channel_id: Some(scid),
short_channel_id: Some(scid),
- remote_network_id: *rnid,
- counterparty_features: InitFeatures::known(),
channel_value_satoshis: slice_to_be64(get_slice!(8)),
channel_value_satoshis: slice_to_be64(get_slice!(8)),
- user_id: 0,
- inbound_capacity_msat: 0,
- is_live: true,
+ user_channel_id: 0, inbound_capacity_msat: 0,
+ unspendable_punishment_reserve: None,
+ confirmations_required: None,
+ force_close_spend_delay: None,
+ is_outbound: true, is_funding_locked: true,
+ is_usable: true, is_public: true,
outbound_capacity_msat: 0,
});
}
Some(&first_hops_vec[..])
},
};
outbound_capacity_msat: 0,
});
}
Some(&first_hops_vec[..])
},
};
- let mut last_hops
_vec
= Vec::new();
+ let mut last_hops = Vec::new();
{
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 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();
- last_hops
_vec.push(RouteHint
{
+ last_hops
.push(RouteHint(vec![RouteHintHop
{
src_node_id: *rnid,
short_channel_id: scid,
fees: RoutingFees {
src_node_id: *rnid,
short_channel_id: scid,
fees: RoutingFees {
@@
-229,16
+243,17
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
proportional_millionths: slice_to_be32(get_slice!(4)),
},
cltv_expiry_delta: slice_to_be16(get_slice!(2)),
proportional_millionths: slice_to_be32(get_slice!(4)),
},
cltv_expiry_delta: slice_to_be16(get_slice!(2)),
- htlc_minimum_msat: slice_to_be64(get_slice!(8)),
- });
+ htlc_minimum_msat: Some(slice_to_be64(get_slice!(8))),
+ htlc_maximum_msat: None,
+ }]));
}
}
}
}
- let
last_hops = &last_hops_vec[..]
;
+ let
scorer = Scorer::new(0)
;
for target in node_pks.iter() {
for target in node_pks.iter() {
- let _ = get_route(&our_pubkey, &net_graph, target,
+ let _ = get_route(&our_pubkey, &net_graph, target,
None,
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
&last_hops.iter().collect::<Vec<_>>(),
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
&last_hops.iter().collect::<Vec<_>>(),
- slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger));
+ slice_to_be64(get_slice!(8)), slice_to_be32(get_slice!(4)), Arc::clone(&logger)
, &scorer
);
}
},
}
}
},
}