mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 15:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #367 from TheBlueMatt/2019-07-fst-unique-channels

Browse source 
Make temporary channel ids unique in full_stack_target
This commit is contained in:
Matt Corallo 2019-07-30 18:26:57 +00:00 • committed by GitHub
commit 0d162968d6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
fuzz/fuzz_targets/full_stack_target.rs
View file

@ -49,7 +49,7 @@ use std::collections::{HashMap, hash_map};
use std::cmp; use std::cmp;
use std::hash::Hash; use std::hash::Hash;
use std::sync::Arc; use std::sync::Arc;
use std::sync::atomic::{AtomicU8,AtomicUsize,Ordering}; use std::sync::atomic::{AtomicU64,AtomicUsize,Ordering};
#[inline] #[inline]
pub fn slice_to_be16(v: &[u8]) -> u16 { pub fn slice_to_be16(v: &[u8]) -> u16 {
@ -236,7 +236,7 @@ impl<'a> Drop for MoneyLossDetector<'a> {
struct KeyProvider { struct KeyProvider {
node_secret: SecretKey, node_secret: SecretKey,
counter: AtomicU8, counter: AtomicU64,
} }
impl KeysInterface for KeyProvider { impl KeysInterface for KeyProvider {
fn get_node_secret(&self) -> SecretKey { fn get_node_secret(&self) -> SecretKey {
@ -256,7 +256,7 @@ impl KeysInterface for KeyProvider {
} }
fn get_channel_keys(&self, inbound: bool) -> ChannelKeys { fn get_channel_keys(&self, inbound: bool) -> ChannelKeys {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed); let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
if inbound { if inbound {
ChannelKeys { ChannelKeys {
funding_key: SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, ctr]).unwrap(), funding_key: SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, ctr]).unwrap(),
@ -279,13 +279,14 @@ impl KeysInterface for KeyProvider {
} }
fn get_session_key(&self) -> SecretKey { fn get_session_key(&self) -> SecretKey {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed); let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, ctr]).unwrap() SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13, ctr]).unwrap()
} }
fn get_channel_id(&self) -> [u8; 32] { fn get_channel_id(&self) -> [u8; 32] {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed); let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, ctr] [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
} }
} }
@ -326,7 +327,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
let broadcast = Arc::new(TestBroadcaster{}); let broadcast = Arc::new(TestBroadcaster{});
let monitor = channelmonitor::SimpleManyChannelMonitor::new(watch.clone(), broadcast.clone(), Arc::clone(&logger), fee_est.clone()); let monitor = channelmonitor::SimpleManyChannelMonitor::new(watch.clone(), broadcast.clone(), Arc::clone(&logger), fee_est.clone());
let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), counter: AtomicU8::new(0) }); let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), counter: AtomicU64::new(0) });
let mut config = UserConfig::new(); let mut config = UserConfig::new();
config.channel_options.fee_proportional_millionths = slice_to_be32(get_slice!(4)); config.channel_options.fee_proportional_millionths = slice_to_be32(get_slice!(4));
config.channel_options.announced_channel = get_slice!(1)[0] != 0; config.channel_options.announced_channel = get_slice!(1)[0] != 0;