projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f5a5729
)
Use more Writeable/Readable for Option<T> in ChannelMonitor
author
Antoine Riard
<ariard@student.42.fr>
Wed, 10 Apr 2019 00:01:18 +0000
(20:01 -0400)
committer
Antoine Riard
<ariard@student.42.fr>
Wed, 10 Apr 2019 00:01:18 +0000
(20:01 -0400)
src/ln/channelmonitor.rs
patch
|
blob
|
history
diff --git
a/src/ln/channelmonitor.rs
b/src/ln/channelmonitor.rs
index 25f41d882964d0e6d0af4ac89f36f9d0bcb1ddf8..cc77003cd9fb29be0c1eb9e25e1cf3467c85429c 100644
(file)
--- a/
src/ln/channelmonitor.rs
+++ b/
src/ln/channelmonitor.rs
@@
-801,18
+801,8
@@
impl ChannelMonitor {
writer.write_all(&delayed_payment_base_key[..])?;
writer.write_all(&payment_base_key[..])?;
writer.write_all(&shutdown_pubkey.serialize())?;
writer.write_all(&delayed_payment_base_key[..])?;
writer.write_all(&payment_base_key[..])?;
writer.write_all(&shutdown_pubkey.serialize())?;
- if let Some(ref prev_latest_per_commitment_point) = *prev_latest_per_commitment_point {
- writer.write_all(&[1; 1])?;
- 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])?;
- }
+ prev_latest_per_commitment_point.write(writer)?;
+ latest_per_commitment_point.write(writer)?;
match funding_info {
&Some((ref outpoint, ref script)) => {
writer.write_all(&outpoint.txid[..])?;
match funding_info {
&Some((ref outpoint, ref script)) => {
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)
;
-
write_option!(prev_remote_commitment_txid)
;
+
current_remote_commitment_txid.write(writer)?
;
+
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::be32_to_array($htlc_output.cltv_expiry))?;
writer.write_all(&$htlc_output.payment_hash.0[..])?;
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(&$htlc_output.payment_hash.0[..])?;
-
write_option!(&$htlc_output.transaction_output_index)
;
+
$htlc_output.transaction_output_index.write(writer)?
;
}
}
}
}