projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an `optional_vec` TLV format which makes sense, unlike vec_type
[rust-lightning]
/
lightning
/
src
/
chain
/
onchaintx.rs
diff --git
a/lightning/src/chain/onchaintx.rs
b/lightning/src/chain/onchaintx.rs
index 039fb5ff13a04eb1fd843d061bbd992a0f394935..d3ca02ca7a555114970976fc06dabbe408747b99 100644
(file)
--- a/
lightning/src/chain/onchaintx.rs
+++ b/
lightning/src/chain/onchaintx.rs
@@
-36,7
+36,7
@@
use crate::chain::keysinterface::WriteableEcdsaChannelSigner;
use crate::chain::package::PackageSolvingData;
use crate::chain::package::PackageTemplate;
use crate::util::logger::Logger;
use crate::chain::package::PackageSolvingData;
use crate::chain::package::PackageTemplate;
use crate::util::logger::Logger;
-use crate::util::ser::{Readable, ReadableArgs, MaybeReadable, Writer, Writeable, VecWriter};
+use crate::util::ser::{Readable, ReadableArgs, MaybeReadable,
UpgradableRequired,
Writer, Writeable, VecWriter};
use crate::io;
use crate::prelude::*;
use crate::io;
use crate::prelude::*;
@@
-106,18
+106,14
@@
impl MaybeReadable for OnchainEventEntry {
let mut txid = Txid::all_zeros();
let mut height = 0;
let mut block_hash = None;
let mut txid = Txid::all_zeros();
let mut height = 0;
let mut block_hash = None;
- let mut event =
None
;
+ let mut event =
UpgradableRequired(None)
;
read_tlv_fields!(reader, {
(0, txid, required),
(1, block_hash, option),
(2, height, required),
read_tlv_fields!(reader, {
(0, txid, required),
(1, block_hash, option),
(2, height, required),
- (4, event,
ignorable
),
+ (4, event,
upgradable_required
),
});
});
- if let Some(ev) = event {
- Ok(Some(Self { txid, height, block_hash, event: ev }))
- } else {
- Ok(None)
- }
+ Ok(Some(Self { txid, height, block_hash, event: _init_tlv_based_struct_field!(event, upgradable_required) }))
}
}
}
}