projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Consider `RouteParameters::max_total_routing_fee_msat` in `get_route`
[rust-lightning]
/
lightning
/
src
/
util
/
chacha20poly1305rfc.rs
diff --git
a/lightning/src/util/chacha20poly1305rfc.rs
b/lightning/src/util/chacha20poly1305rfc.rs
index 3254e8b0134d298517fcc9095792fb48c9935b50..a5bec2c82b8cf00da2a597d3c68026aa7e87152f 100644
(file)
--- a/
lightning/src/util/chacha20poly1305rfc.rs
+++ b/
lightning/src/util/chacha20poly1305rfc.rs
@@
-10,14
+10,14
@@
// This is a port of Andrew Moons poly1305-donna
// https://github.com/floodyberry/poly1305-donna
// This is a port of Andrew Moons poly1305-donna
// https://github.com/floodyberry/poly1305-donna
-use ln::msgs::DecodeError;
-use util::ser::{FixedLengthReader, LengthRead, LengthReadableArgs, Readable, Writeable, Writer};
-use io::{self, Read, Write};
+use
crate::
ln::msgs::DecodeError;
+use
crate::
util::ser::{FixedLengthReader, LengthRead, LengthReadableArgs, Readable, Writeable, Writer};
+use
crate::
io::{self, Read, Write};
#[cfg(not(fuzzing))]
mod real_chachapoly {
#[cfg(not(fuzzing))]
mod real_chachapoly {
- use util::chacha20::ChaCha20;
- use util::poly1305::Poly1305;
+ use
crate::
util::chacha20::ChaCha20;
+ use
crate::
util::poly1305::Poly1305;
use bitcoin::hashes::cmp::fixed_time_eq;
#[derive(Clone, Copy)]
use bitcoin::hashes::cmp::fixed_time_eq;
#[derive(Clone, Copy)]
@@
-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,
}
@@
-330,9
+329,9
@@
pub use self::fuzzy_chachapoly::ChaCha20Poly1305RFC;
#[cfg(test)]
mod tests {
#[cfg(test)]
mod tests {
- use ln::msgs::DecodeError;
+ use
crate::
ln::msgs::DecodeError;
use super::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
use super::{ChaChaPolyReadAdapter, ChaChaPolyWriteAdapter};
- use util::ser::{self, FixedLengthReader, LengthReadableArgs, Writeable};
+ use
crate::
util::ser::{self, FixedLengthReader, LengthReadableArgs, Writeable};
// Used for for testing various lengths of serialization.
#[derive(Debug, PartialEq, Eq)]
// Used for for testing various lengths of serialization.
#[derive(Debug, PartialEq, Eq)]
@@
-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()
}
}