use lightning::ln::channel::{Channel, ChannelKeys};
use lightning::ln::channelmanager::{HTLCFailReason, PendingForwardHTLCInfo};
use lightning::ln::msgs;
-use lightning::ln::msgs::MsgDecodable;
+use lightning::ln::msgs::{MsgDecodable, ErrorAction};
use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
+use lightning::chain::transaction::OutPoint;
use lightning::util::reset_rng_state;
use secp256k1::key::{PublicKey, SecretKey};
input: &'a InputData<'a>,
}
impl<'a> FeeEstimator for FuzzEstimator<'a> {
- fn get_est_sat_per_vbyte(&self, _: ConfirmationTarget) -> u64 {
+ fn get_est_sat_per_1000_weight(&self, _: ConfirmationTarget) -> u64 {
//TODO: We should actually be testing at least much more than 64k...
match self.input.get_slice(2) {
- Some(slice) => slice_to_be16(slice) as u64,
+ Some(slice) => slice_to_be16(slice) as u64 * 250,
None => 0
}
}
msgs::DecodeError::UnknownRealmByte => return,
msgs::DecodeError::BadPublicKey => return,
msgs::DecodeError::BadSignature => return,
+ msgs::DecodeError::BadText => return,
msgs::DecodeError::ExtraAddressesPerType => return,
- msgs::DecodeError::WrongLength => panic!("We picked the length..."),
+ msgs::DecodeError::BadLengthDescriptor => return,
+ msgs::DecodeError::ShortRead => panic!("We picked the length..."),
}
}
}
msgs::DecodeError::UnknownRealmByte => return,
msgs::DecodeError::BadPublicKey => return,
msgs::DecodeError::BadSignature => return,
+ msgs::DecodeError::BadText => return,
msgs::DecodeError::ExtraAddressesPerType => return,
- msgs::DecodeError::WrongLength => panic!("We picked the length..."),
+ msgs::DecodeError::BadLengthDescriptor => return,
+ msgs::DecodeError::ShortRead => panic!("We picked the length..."),
}
}
}
macro_rules! return_err {
($expr: expr) => {
match $expr {
- Ok(_) => {},
+ Ok(r) => r,
Err(_) => return,
}
}
return_err!(chan.accept_channel(&accept_chan));
tx.output.push(TxOut{ value: chan_value, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
- let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+ let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
- chan.get_outbound_funding_created(funding_output.0.clone(), funding_output.1).unwrap();
+ chan.get_outbound_funding_created(funding_output).unwrap();
let funding_signed = decode_msg!(msgs::FundingSigned, 32+64);
return_err!(chan.funding_signed(&funding_signed));
chan
chan.get_accept_channel().unwrap();
tx.output.push(TxOut{ value: open_chan.funding_satoshis, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
- let funding_output = (Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
+ let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
let mut funding_created = decode_msg!(msgs::FundingCreated, 32+32+2+64);
- funding_created.funding_txid = funding_output.0.clone();
- funding_created.funding_output_index = funding_output.1;
+ funding_created.funding_txid = funding_output.txid.clone();
+ funding_created.funding_output_index = funding_output.index;
return_err!(chan.funding_created(&funding_created));
chan
};
let funding_locked = decode_msg!(msgs::FundingLocked, 32+33);
return_err!(channel.funding_locked(&funding_locked));
+ macro_rules! test_err {
+ ($expr: expr) => {
+ match $expr {
+ Ok(r) => Some(r),
+ Err(e) => match e.action {
+ None => return,
+ Some(ErrorAction::UpdateFailHTLC {..}) => None,
+ Some(ErrorAction::DisconnectPeer {..}) => return,
+ Some(ErrorAction::IgnoreError) => None,
+ Some(ErrorAction::SendErrorMessage {..}) => None,
+ },
+ }
+ }
+ }
+
loop {
match get_slice!(1)[0] {
0 => {
- return_err!(channel.send_htlc(slice_to_be64(get_slice!(8)), [42; 32], slice_to_be32(get_slice!(4)), msgs::OnionPacket {
+ test_err!(channel.send_htlc(slice_to_be64(get_slice!(8)), [42; 32], slice_to_be32(get_slice!(4)), msgs::OnionPacket {
version: get_slice!(1)[0],
public_key: get_pubkey!(),
hop_data: [0; 20*65],
}));
},
1 => {
- return_err!(channel.send_commitment());
+ test_err!(channel.send_commitment());
},
2 => {
let update_add_htlc = decode_msg!(msgs::UpdateAddHTLC, 32+8+8+32+4+4+33+20*65+32);
- return_err!(channel.update_add_htlc(&update_add_htlc, PendingForwardHTLCInfo::dummy()));
+ test_err!(channel.update_add_htlc(&update_add_htlc, PendingForwardHTLCInfo::dummy()));
},
3 => {
let update_fulfill_htlc = decode_msg!(msgs::UpdateFulfillHTLC, 32 + 8 + 32);
- return_err!(channel.update_fulfill_htlc(&update_fulfill_htlc));
+ test_err!(channel.update_fulfill_htlc(&update_fulfill_htlc));
},
4 => {
let update_fail_htlc = decode_msg_with_len16!(msgs::UpdateFailHTLC, 32 + 8, 1);
- return_err!(channel.update_fail_htlc(&update_fail_htlc, HTLCFailReason::dummy()));
+ test_err!(channel.update_fail_htlc(&update_fail_htlc, HTLCFailReason::dummy()));
},
5 => {
let update_fail_malformed_htlc = decode_msg!(msgs::UpdateFailMalformedHTLC, 32+8+32+2);
- return_err!(channel.update_fail_malformed_htlc(&update_fail_malformed_htlc, HTLCFailReason::dummy()));
+ test_err!(channel.update_fail_malformed_htlc(&update_fail_malformed_htlc, HTLCFailReason::dummy()));
},
6 => {
let commitment_signed = decode_msg_with_len16!(msgs::CommitmentSigned, 32+64, 64);
- return_err!(channel.commitment_signed(&commitment_signed));
+ test_err!(channel.commitment_signed(&commitment_signed));
},
7 => {
let revoke_and_ack = decode_msg!(msgs::RevokeAndACK, 32+32+33);
- return_err!(channel.revoke_and_ack(&revoke_and_ack));
+ test_err!(channel.revoke_and_ack(&revoke_and_ack));
},
8 => {
let update_fee = decode_msg!(msgs::UpdateFee, 32+4);
- return_err!(channel.update_fee(&fee_est, &update_fee));
+ test_err!(channel.update_fee(&fee_est, &update_fee));
},
9 => {
let shutdown = decode_msg_with_len16!(msgs::Shutdown, 32, 1);
- return_err!(channel.shutdown(&fee_est, &shutdown));
+ test_err!(channel.shutdown(&fee_est, &shutdown));
+ if channel.is_shutdown() { return; }
},
10 => {
let closing_signed = decode_msg!(msgs::ClosingSigned, 32+8+64);
- return_err!(channel.closing_signed(&fee_est, &closing_signed));
+ let sign_res = test_err!(channel.closing_signed(&fee_est, &closing_signed));
+ if sign_res.is_some() && sign_res.unwrap().1.is_some() {
+ assert!(channel.is_shutdown());
+ return;
+ }
},
_ => return,
}
projects / rust-lightning / blobdiff