use bitcoin::network::serialize::{serialize, BitcoinHash};
use lightning::ln::channel::{Channel, ChannelKeys};
-use lightning::ln::channelmanager::{HTLCFailReason, PendingForwardHTLCInfo};
+use lightning::ln::channelmanager::{HTLCFailReason, HTLCSource, PendingHTLCStatus};
use lightning::ln::msgs;
-use lightning::ln::msgs::{MsgDecodable, ErrorAction};
+use lightning::ln::msgs::{ErrorAction};
use lightning::chain::chaininterface::{FeeEstimator, ConfirmationTarget};
use lightning::chain::transaction::OutPoint;
use lightning::util::reset_rng_state;
use lightning::util::logger::Logger;
+use lightning::util::ser::{Readable, Reader};
mod utils;
}
macro_rules! decode_msg {
- ($MsgType: path, $len: expr) => {
- match <($MsgType)>::decode(get_slice!($len)) {
+ ($MsgType: path, $len: expr) => {{
+ let mut reader = Reader::new(::std::io::Cursor::new(get_slice!($len)));
+ match <($MsgType)>::read(&mut reader) {
Ok(msg) => msg,
Err(e) => match e {
msgs::DecodeError::UnknownRealmByte => return,
+ msgs::DecodeError::UnknownRequiredFeature => return,
msgs::DecodeError::BadPublicKey => return,
msgs::DecodeError::BadSignature => return,
msgs::DecodeError::BadText => return,
msgs::DecodeError::ExtraAddressesPerType => return,
msgs::DecodeError::BadLengthDescriptor => return,
msgs::DecodeError::ShortRead => panic!("We picked the length..."),
+ msgs::DecodeError::InvalidValue => panic!("Should not happen with p2p message decoding"),
+ msgs::DecodeError::Io(e) => panic!(format!("{}", e)),
}
}
- }
+ }}
}
macro_rules! decode_msg_with_len16 {
Some(slice) => slice,
None => return,
}[$begin_len..$begin_len + 2]);
- match <($MsgType)>::decode(get_slice!($begin_len as usize + 2 + (extra_len as usize)*$factor)) {
- Ok(msg) => msg,
- Err(e) => match e {
- msgs::DecodeError::UnknownRealmByte => return,
- msgs::DecodeError::BadPublicKey => return,
- msgs::DecodeError::BadSignature => return,
- msgs::DecodeError::BadText => return,
- msgs::DecodeError::ExtraAddressesPerType => return,
- msgs::DecodeError::BadLengthDescriptor => return,
- msgs::DecodeError::ShortRead => panic!("We picked the length..."),
- }
- }
+ decode_msg!($MsgType, $begin_len as usize + 2 + (extra_len as usize)*$factor)
}
}
}
Ok(chan) => chan,
Err(_) => return,
};
- chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est).unwrap();
+ chan.get_open_channel(Sha256dHash::from(get_slice!(32)), &fee_est);
let accept_chan = if get_slice!(1)[0] == 0 {
decode_msg_with_len16!(msgs::AcceptChannel, 270, 1)
} else {
Ok(chan) => chan,
Err(_) => return,
};
- chan.get_accept_channel().unwrap();
+ chan.get_accept_channel();
tx.output.push(TxOut{ value: open_chan.funding_satoshis, script_pubkey: chan.get_funding_redeemscript().to_v0_p2wsh() });
let funding_output = OutPoint::new(Sha256dHash::from_data(&serialize(&tx).unwrap()[..]), 0);
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 => {
- test_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)), HTLCSource::dummy(), msgs::OnionPacket {
version: get_slice!(1)[0],
- public_key: get_pubkey!(),
+ public_key: PublicKey::from_slice(&secp_ctx, get_slice!(33)),
hop_data: [0; 20*65],
hmac: [0; 32],
}));
},
2 => {
let update_add_htlc = decode_msg!(msgs::UpdateAddHTLC, 32+8+8+32+4+4+33+20*65+32);
- test_err!(channel.update_add_htlc(&update_add_htlc, PendingForwardHTLCInfo::dummy()));
+ test_err!(channel.update_add_htlc(&update_add_htlc, PendingHTLCStatus::dummy()));
},
3 => {
let update_fulfill_htlc = decode_msg!(msgs::UpdateFulfillHTLC, 32 + 8 + 32);