projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #1481 from TheBlueMatt/2022-05-new-chain-tests
[rust-lightning]
/
fuzz
/
src
/
router.rs
diff --git
a/fuzz/src/router.rs
b/fuzz/src/router.rs
index 5494b26c7a300e5cb99d1056cd9054a9d626a8ac..786bfa3e589eb05dc393a807be90efc46c5febf7 100644
(file)
--- a/
fuzz/src/router.rs
+++ b/
fuzz/src/router.rs
@@
-23,12
+23,13
@@
use lightning::util::ser::Readable;
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
use bitcoin::hashes::Hash;
use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
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 utils::test_logger;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;
use 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};
@@
-205,7
+206,8
@@
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 {
first_hops_vec.push(ChannelDetails {
channel_id: [0; 32],
counterparty: ChannelCounterparty {
@@
-213,11
+215,14
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
features: InitFeatures::known(),
unspendable_punishment_reserve: 0,
forwarding_info: None,
features: InitFeatures::known(),
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,
short_channel_id: Some(scid),
inbound_scid_alias: None,
- channel_value_satoshis:
slice_to_be64(get_slice!(8))
,
+ 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,
@@
-225,7
+230,10
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
is_outbound: true, is_funding_locked: true,
is_usable: true, is_public: true,
balance_msat: 0,
is_outbound: true, is_funding_locked: true,
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,
});
}
Some(&first_hops_vec[..])
});
}
Some(&first_hops_vec[..])