projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename APIError::RouteError to ::InvalidRoute
[rust-lightning]
/
fuzz
/
src
/
router.rs
diff --git
a/fuzz/src/router.rs
b/fuzz/src/router.rs
index bb6ba2c6e51cb0a2ac65d86023279c08954532b9..761f7bddc864706d39ebb44739f3dd2082cd365c 100644
(file)
--- a/
fuzz/src/router.rs
+++ b/
fuzz/src/router.rs
@@
-13,21
+13,19
@@
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::gossip::{NetworkGraph, RoutingFees};
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::FixedPenaltyScorer;
use lightning::routing::router::{find_route, PaymentParameters, RouteHint, RouteHintHop, RouteParameters};
use lightning::routing::scoring::FixedPenaltyScorer;
-use lightning::util::logger::Logger;
use lightning::util::ser::Readable;
use lightning::util::ser::Readable;
-use lightning::routing::network_graph::{NetworkGraph, RoutingFees};
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
use bitcoin::network::constants::Network;
use bitcoin::blockdata::constants::genesis_block;
use bitcoin::hashes::Hash;
use bitcoin::secp256k1::PublicKey;
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::convert::TryInto;
use std::collections::HashSet;
@@
-159,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;
@@
-196,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() => {},
_ => {
@@
-212,7
+210,7
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
channel_id: [0; 32],
counterparty: ChannelCounterparty {
node_id: *rnid,
channel_id: [0; 32],
counterparty: ChannelCounterparty {
node_id: *rnid,
- features:
InitFeatures::known
(),
+ features:
channelmanager::provided_init_features
(),
unspendable_punishment_reserve: 0,
forwarding_info: None,
outbound_htlc_minimum_msat: None,
unspendable_punishment_reserve: 0,
forwarding_info: None,
outbound_htlc_minimum_msat: None,
@@
-227,6
+225,7
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
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,
is_outbound: true, is_channel_ready: true,
is_usable: true, is_public: true,
force_close_spend_delay: None,
is_outbound: true, is_channel_ready: true,
is_usable: true, is_public: true,
@@
-235,6
+234,7
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
next_outbound_htlc_limit_msat: capacity.saturating_mul(1000),
inbound_htlc_minimum_msat: None,
inbound_htlc_maximum_msat: None,
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[..])
@@
-269,7
+269,7
@@
pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
};
let _ = find_route(&our_pubkey, &route_params, &net_graph,
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
};
let _ = find_route(&our_pubkey, &route_params, &net_graph,
first_hops.map(|c| c.iter().collect::<Vec<_>>()).as_ref().map(|a| a.as_slice()),
-
Arc::clone(&logger)
, &scorer, &random_seed_bytes);
+
&logger
, &scorer, &random_seed_bytes);
}
},
}
}
},
}