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

Merge pull request #332 from ariard/2019-03-option-serialize-channel-monitor

Browse source 
Use more Writeable/Readable for Option<T> in ChannelMonitor serializer/deserializer
This commit is contained in:
Matt Corallo 2019-04-10 12:00:59 -04:00 • committed by GitHub
commit 5bd8837ac3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/ln/channelmonitor.rs
View file

@ -801,18 +801,8 @@ impl ChannelMonitor {
writer.write_all(&delayed_payment_base_key[..])?; writer.write_all(&delayed_payment_base_key[..])?;
writer.write_all(&payment_base_key[..])?; writer.write_all(&payment_base_key[..])?;
writer.write_all(&shutdown_pubkey.serialize())?; writer.write_all(&shutdown_pubkey.serialize())?;
if let Some(ref prev_latest_per_commitment_point) = *prev_latest_per_commitment_point { prev_latest_per_commitment_point.write(writer)?;
writer.write_all(&[1; 1])?; latest_per_commitment_point.write(writer)?;
writer.write_all(&prev_latest_per_commitment_point.serialize())?;
} else {
writer.write_all(&[0; 1])?;
}
if let Some(ref latest_per_commitment_point) = *latest_per_commitment_point {
writer.write_all(&[1; 1])?;
writer.write_all(&latest_per_commitment_point.serialize())?;
} else {
writer.write_all(&[0; 1])?;
}
match funding_info { match funding_info {
&Some((ref outpoint, ref script)) => { &Some((ref outpoint, ref script)) => {
writer.write_all(&outpoint.txid[..])?; writer.write_all(&outpoint.txid[..])?;
@ -823,8 +813,8 @@ impl ChannelMonitor {
debug_assert!(false, "Try to serialize a useless Local monitor !"); debug_assert!(false, "Try to serialize a useless Local monitor !");
}, },
} }
write_option!(current_remote_commitment_txid); current_remote_commitment_txid.write(writer)?;
write_option!(prev_remote_commitment_txid); prev_remote_commitment_txid.write(writer)?;
}, },
Storage::Watchtower { .. } => unimplemented!(), Storage::Watchtower { .. } => unimplemented!(),
} }
@ -864,7 +854,7 @@ impl ChannelMonitor {
writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?; writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?; writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
writer.write_all(&$htlc_output.payment_hash.0[..])?; writer.write_all(&$htlc_output.payment_hash.0[..])?;
write_option!(&$htlc_output.transaction_output_index); $htlc_output.transaction_output_index.write(writer)?;
} }
} }