projects
/
rust-lightning
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
73e7f4d
)
f - Don't write ChannelMonitor shutdown script as TLV
author
Jeffrey Czyz
<jkczyz@gmail.com>
Fri, 30 Jul 2021 20:40:26 +0000
(15:40 -0500)
committer
Jeffrey Czyz
<jkczyz@gmail.com>
Sat, 31 Jul 2021 05:13:35 +0000
(
00:13
-0500)
lightning/src/chain/channelmonitor.rs
patch
|
blob
|
history
diff --git
a/lightning/src/chain/channelmonitor.rs
b/lightning/src/chain/channelmonitor.rs
index cfbd0e64fc38700a08306ed7e240c9c87dfccf0a..d57d50c613ba43d4dd64c2b9d84d66ff463a9f22 100644
(file)
--- a/
lightning/src/chain/channelmonitor.rs
+++ b/
lightning/src/chain/channelmonitor.rs
@@
-791,10
+791,6
@@
impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
self.lockdown_from_offchain.write(writer)?;
self.holder_tx_signed.write(writer)?;
self.lockdown_from_offchain.write(writer)?;
self.holder_tx_signed.write(writer)?;
- write_tlv_fields!(writer, {
- (1, self.shutdown_script, option),
- });
-
Ok(())
}
}
Ok(())
}
}
@@
-2611,7
+2607,7
@@
impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
_ => return Err(DecodeError::InvalidValue),
};
let counterparty_payment_script = Readable::read(reader)?;
_ => return Err(DecodeError::InvalidValue),
};
let counterparty_payment_script = Readable::read(reader)?;
- let
mut
shutdown_script = {
+ let shutdown_script = {
let script = <Script as Readable>::read(reader)?;
if script.is_empty() { None } else { Some(script) }
};
let script = <Script as Readable>::read(reader)?;
if script.is_empty() { None } else { Some(script) }
};
@@
-2768,10
+2764,6
@@
impl<'a, Signer: Sign, K: KeysInterface<Signer = Signer>> ReadableArgs<&'a K>
let lockdown_from_offchain = Readable::read(reader)?;
let holder_tx_signed = Readable::read(reader)?;
let lockdown_from_offchain = Readable::read(reader)?;
let holder_tx_signed = Readable::read(reader)?;
- read_tlv_fields!(reader, {
- (1, shutdown_script, option),
- });
-
let mut secp_ctx = Secp256k1::new();
secp_ctx.seeded_randomize(&keys_manager.get_secure_random_bytes());
let mut secp_ctx = Secp256k1::new();
secp_ctx.seeded_randomize(&keys_manager.get_secure_random_bytes());