mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Moving LN_MAX_MSG_LEN const to the actual use place

Browse source
This commit is contained in:
Dr. Maxim Orlovsky 2020-07-21 14:14:01 +02:00
parent 0e5dfadf64
commit 4bb5955be9
3 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lightning/src/ln/mod.rs
View file

@ -36,4 +36,4 @@ mod chanmon_update_fail_tests;
#[cfg(test)] #[cfg(test)]
mod reorg_tests; mod reorg_tests;
pub use self::wire::LN_MAX_MSG_LEN; pub use self::peer_channel_encryptor::LN_MAX_MSG_LEN;

12
lightning/src/ln/peer_channel_encryptor.rs
View file

@ -1,6 +1,5 @@
use ln::msgs::LightningError; use ln::msgs::LightningError;
use ln::msgs; use ln::msgs;
use ln::wire::LN_MAX_MSG_LEN;
use bitcoin::hashes::{Hash, HashEngine, Hmac, HmacEngine}; use bitcoin::hashes::{Hash, HashEngine, Hmac, HmacEngine};
use bitcoin::hashes::sha256::Hash as Sha256; use bitcoin::hashes::sha256::Hash as Sha256;
@ -13,6 +12,11 @@ use bitcoin::secp256k1;
use util::chacha20poly1305rfc::ChaCha20Poly1305RFC; use util::chacha20poly1305rfc::ChaCha20Poly1305RFC;
use util::byte_utils; use util::byte_utils;
/// Maximum Lightning message data length according to
/// [BOLT-8](https://github.com/lightningnetwork/lightning-rfc/blob/v1.0/08-transport.md#lightning-message-specification)
/// and [BOLT-1](https://github.com/lightningnetwork/lightning-rfc/blob/master/01-messaging.md#lightning-message-format):
pub const LN_MAX_MSG_LEN: usize = ::std::u16::MAX as usize; // Must be equal to 65535
// Sha256("Noise_XK_secp256k1_ChaChaPoly_SHA256") // Sha256("Noise_XK_secp256k1_ChaChaPoly_SHA256")
const NOISE_CK: [u8; 32] = [0x26, 0x40, 0xf5, 0x2e, 0xeb, 0xcd, 0x9e, 0x88, 0x29, 0x58, 0x95, 0x1c, 0x79, 0x42, 0x50, 0xee, 0xdb, 0x28, 0x00, 0x2c, 0x05, 0xd7, 0xdc, 0x2e, 0xa0, 0xf1, 0x95, 0x40, 0x60, 0x42, 0xca, 0xf1]; const NOISE_CK: [u8; 32] = [0x26, 0x40, 0xf5, 0x2e, 0xeb, 0xcd, 0x9e, 0x88, 0x29, 0x58, 0x95, 0x1c, 0x79, 0x42, 0x50, 0xee, 0xdb, 0x28, 0x00, 0x2c, 0x05, 0xd7, 0xdc, 0x2e, 0xa0, 0xf1, 0x95, 0x40, 0x60, 0x42, 0xca, 0xf1];
// Sha256(NOISE_CK || "lightning") // Sha256(NOISE_CK || "lightning")
@ -698,6 +702,12 @@ mod tests {
} }
} }
#[test]
fn max_msg_len_limit_value() {
assert_eq!(LN_MAX_MSG_LEN, 65535);
assert_eq!(LN_MAX_MSG_LEN, ::std::u16::MAX as usize);
}
#[test] #[test]
#[should_panic(expected = "Attempted to encrypt message longer than 65535 bytes!")] #[should_panic(expected = "Attempted to encrypt message longer than 65535 bytes!")]
fn max_message_len_encryption() { fn max_message_len_encryption() {

11
lightning/src/ln/wire.rs
View file

@ -16,11 +16,6 @@
use ln::msgs; use ln::msgs;
use util::ser::{Readable, Writeable, Writer}; use util::ser::{Readable, Writeable, Writer};
/// Maximum Lightning message data length according to
/// [BOLT-8](https://github.com/lightningnetwork/lightning-rfc/blob/v1.0/08-transport.md#lightning-message-specification)
/// and [BOLT-1](https://github.com/lightningnetwork/lightning-rfc/blob/master/01-messaging.md#lightning-message-format):
pub const LN_MAX_MSG_LEN: usize = std::u16::MAX as usize; // Must be equal to 65535
/// A Lightning message returned by [`read`] when decoding bytes received over the wire. Each /// A Lightning message returned by [`read`] when decoding bytes received over the wire. Each
/// variant contains a message from [`ln::msgs`] or otherwise the message type if unknown. /// variant contains a message from [`ln::msgs`] or otherwise the message type if unknown.
/// ///
@ -316,12 +311,6 @@ mod tests {
// Big-endian wire encoding of Pong message (type = 19, byteslen = 2). // Big-endian wire encoding of Pong message (type = 19, byteslen = 2).
const ENCODED_PONG: [u8; 6] = [0u8, 19u8, 0u8, 2u8, 0u8, 0u8]; const ENCODED_PONG: [u8; 6] = [0u8, 19u8, 0u8, 2u8, 0u8, 0u8];
#[test]
fn max_msg_len() {
assert_eq!(LN_MAX_MSG_LEN, 65535);
assert_eq!(LN_MAX_MSG_LEN, std::u16::MAX as usize);
}
#[test] #[test]
fn read_empty_buffer() { fn read_empty_buffer() {
let buffer = []; let buffer = [];