projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2657 from Fedeparma74/fix-close-channel-deadlock
[rust-lightning]
/
lightning
/
src
/
util
/
chacha20poly1305rfc.rs
diff --git
a/lightning/src/util/chacha20poly1305rfc.rs
b/lightning/src/util/chacha20poly1305rfc.rs
index 1b75648019ae52f916f303b92017508d429a4c08..a5bec2c82b8cf00da2a597d3c68026aa7e87152f 100644
(file)
--- a/
lightning/src/util/chacha20poly1305rfc.rs
+++ b/
lightning/src/util/chacha20poly1305rfc.rs
@@
-228,7
+228,6
@@
impl<'a, T: Writeable> Writeable for ChaChaPolyWriteAdapter<'a, T> {
/// Enables the use of the serialization macros for objects that need to be simultaneously decrypted and
/// deserialized. This allows us to avoid an intermediate Vec allocation.
pub(crate) struct ChaChaPolyReadAdapter<R: Readable> {
/// Enables the use of the serialization macros for objects that need to be simultaneously decrypted and
/// deserialized. This allows us to avoid an intermediate Vec allocation.
pub(crate) struct ChaChaPolyReadAdapter<R: Readable> {
- #[allow(unused)] // This will be used soon for onion messages
pub readable: R,
}
pub readable: R,
}
@@
-342,9
+341,9
@@
mod tests {
field3: Vec<u8>,
}
impl_writeable_tlv_based!(TestWriteable, {
field3: Vec<u8>,
}
impl_writeable_tlv_based!(TestWriteable, {
- (1, field1,
vec_type
),
- (2, field2,
vec_type
),
- (3, field3,
vec_type
),
+ (1, field1,
required_vec
),
+ (2, field2,
required_vec
),
+ (3, field3,
required_vec
),
});
#[test]
});
#[test]
@@
-412,7
+411,7
@@
mod tests {
#[test]
fn chacha_stream_adapters_ser_macros() {
// Test that our stream adapters work as expected with the TLV macros.
#[test]
fn chacha_stream_adapters_ser_macros() {
// Test that our stream adapters work as expected with the TLV macros.
- // This also serves to test the `option: $trait` variant of the `decode_tlv` ser macro.
+ // This also serves to test the `option: $trait` variant of the `
_
decode_tlv` ser macro.
do_chacha_stream_adapters_ser_macros().unwrap()
}
}
do_chacha_stream_adapters_ser_macros().unwrap()
}
}