Skip to content

Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mariocynicys wants to merge 8 commits into from
Closed

Expose some useful tlv macros #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a3cec7b
Exposing minimal macro set
mariocynicys Jun 15, 2022
64de58e
Prefixing imports with `$crate::` in ser/deser macros so they work wi…
mariocynicys Jun 16, 2022
5c8807d
TLV types MUST be strictly increasing (< and not <=)
mariocynicys Jun 17, 2022
319de94
Fix a typo
mariocynicys Jun 17, 2022
402aeb4
Add docs for exposed (de)serialization macros
mariocynicys Jun 17, 2022
4bab16e
Fix some macro docs
mariocynicys Jun 18, 2022
594c101
Prefix usage of exported macros with `$crate` so users don't have to …
mariocynicys Jun 20, 2022
3cab634
These comparisons are always false
mariocynicys Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lightning/src/ln/msgs.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down
2 changes: 1 addition & 1 deletion lightning/src/util/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down
16 changes: 11 additions & 5 deletions lightning/src/util/ser.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
read: R,
bytes_read: u64,
total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
/// Returns a new FixedLengthReader.
pub fn new(read: R, total_bytes: u64) -> Self {
Self { read, bytes_read: 0, total_bytes }
}

/// Returns whether there are remaining bytes or not.
#[inline]
pub fn bytes_remain(&mut self) -> bool {
self.bytes_read != self.total_bytes
}

/// Consume the remaning bytes.
#[inline]
pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
read: R,
/// Tells whether we have read from this reader or not yet.
pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
/// Returns a new ReadTrackingReader.
pub fn new(read: R) -> Self {
Self { read, have_read: false }
}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
#[inline]
fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
#[inline]
fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
#[inline]
fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Expose some useful tlv macros by mariocynicys · Pull Request #1551 · lightningdevkit/rust-lightning · GitHub
Skip to content
Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mariocynicys
wants to merge
8
commits into

from

 Closed


Expose some useful tlv macros
#1551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
a3cec7b

Exposing minimal macro set


mariocynicys Jun 15, 2022
64de58e

Prefixing imports with `$crate::` in ser/deser macros so they work wi…


mariocynicys Jun 16, 2022
5c8807d

TLV types MUST be strictly increasing (< and not <=)


mariocynicys Jun 17, 2022
319de94

Fix a typo


mariocynicys Jun 17, 2022
402aeb4

Add docs for exposed (de)serialization macros


mariocynicys Jun 17, 2022
4bab16e

Fix some macro docs


mariocynicys Jun 18, 2022
594c101

Prefix usage of exported macros with `$crate` so users don't have to …


mariocynicys Jun 20, 2022
3cab634

These comparisons are always false


mariocynicys Jun 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down

16 changes: 11 additions & 5 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
	read: R,
	bytes_read: u64,
	total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
	/// Returns a new FixedLengthReader.
	pub fn new(read: R, total_bytes: u64) -> Self {
 Self { read, bytes_read: 0, total_bytes }
	}

	/// Returns whether there are remaining bytes or not.
	#[inline]
	pub fn bytes_remain(&mut self) -> bool {
 self.bytes_read != self.total_bytes
	}

	/// Consume the remaning bytes.
	#[inline]
	pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
 copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
	read: R,
	/// Tells whether we have read from this reader or not yet.
	pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
	/// Returns a new ReadTrackingReader.
	pub fn new(read: R) -> Self {
 Self { read, have_read: false }
	}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
	}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
	#[inline]
	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
	#[inline]
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
	#[inline]
	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Expose some useful tlv macros by mariocynicys · Pull Request #1551 · lightningdevkit/rust-lightning · GitHub
Skip to content
Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mariocynicys
wants to merge
8
commits into

from

 Closed


Expose some useful tlv macros
#1551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
a3cec7b

Exposing minimal macro set


mariocynicys Jun 15, 2022
64de58e

Prefixing imports with `$crate::` in ser/deser macros so they work wi…


mariocynicys Jun 16, 2022
5c8807d

TLV types MUST be strictly increasing (< and not <=)


mariocynicys Jun 17, 2022
319de94

Fix a typo


mariocynicys Jun 17, 2022
402aeb4

Add docs for exposed (de)serialization macros


mariocynicys Jun 17, 2022
4bab16e

Fix some macro docs


mariocynicys Jun 18, 2022
594c101

Prefix usage of exported macros with `$crate` so users don't have to …


mariocynicys Jun 20, 2022
3cab634

These comparisons are always false


mariocynicys Jun 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down

16 changes: 11 additions & 5 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
	read: R,
	bytes_read: u64,
	total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
	/// Returns a new FixedLengthReader.
	pub fn new(read: R, total_bytes: u64) -> Self {
 Self { read, bytes_read: 0, total_bytes }
	}

	/// Returns whether there are remaining bytes or not.
	#[inline]
	pub fn bytes_remain(&mut self) -> bool {
 self.bytes_read != self.total_bytes
	}

	/// Consume the remaning bytes.
	#[inline]
	pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
 copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
	read: R,
	/// Tells whether we have read from this reader or not yet.
	pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
	/// Returns a new ReadTrackingReader.
	pub fn new(read: R) -> Self {
 Self { read, have_read: false }
	}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
	}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
	#[inline]
	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
	#[inline]
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
	#[inline]
	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Expose some useful tlv macros by mariocynicys · Pull Request #1551 · lightningdevkit/rust-lightning · GitHub
Skip to content
Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mariocynicys
wants to merge
8
commits into

from

 Closed


Expose some useful tlv macros
#1551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
a3cec7b

Exposing minimal macro set


mariocynicys Jun 15, 2022
64de58e

Prefixing imports with `$crate::` in ser/deser macros so they work wi…


mariocynicys Jun 16, 2022
5c8807d

TLV types MUST be strictly increasing (< and not <=)


mariocynicys Jun 17, 2022
319de94

Fix a typo


mariocynicys Jun 17, 2022
402aeb4

Add docs for exposed (de)serialization macros


mariocynicys Jun 17, 2022
4bab16e

Fix some macro docs


mariocynicys Jun 18, 2022
594c101

Prefix usage of exported macros with `$crate` so users don't have to …


mariocynicys Jun 20, 2022
3cab634

These comparisons are always false


mariocynicys Jun 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down

16 changes: 11 additions & 5 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
	read: R,
	bytes_read: u64,
	total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
	/// Returns a new FixedLengthReader.
	pub fn new(read: R, total_bytes: u64) -> Self {
 Self { read, bytes_read: 0, total_bytes }
	}

	/// Returns whether there are remaining bytes or not.
	#[inline]
	pub fn bytes_remain(&mut self) -> bool {
 self.bytes_read != self.total_bytes
	}

	/// Consume the remaning bytes.
	#[inline]
	pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
 copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
	read: R,
	/// Tells whether we have read from this reader or not yet.
	pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
	/// Returns a new ReadTrackingReader.
	pub fn new(read: R) -> Self {
 Self { read, have_read: false }
	}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
	}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
	#[inline]
	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
	#[inline]
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
	#[inline]
	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
Expose some useful tlv macros by mariocynicys · Pull Request #1551 · lightningdevkit/rust-lightning · GitHub
Skip to content
Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mariocynicys
wants to merge
8
commits into

from

 Closed


Expose some useful tlv macros
#1551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
a3cec7b

Exposing minimal macro set


mariocynicys Jun 15, 2022
64de58e

Prefixing imports with `$crate::` in ser/deser macros so they work wi…


mariocynicys Jun 16, 2022
5c8807d

TLV types MUST be strictly increasing (< and not <=)


mariocynicys Jun 17, 2022
319de94

Fix a typo


mariocynicys Jun 17, 2022
402aeb4

Add docs for exposed (de)serialization macros


mariocynicys Jun 17, 2022
4bab16e

Fix some macro docs


mariocynicys Jun 18, 2022
594c101

Prefix usage of exported macros with `$crate` so users don't have to …


mariocynicys Jun 20, 2022
3cab634

These comparisons are always false


mariocynicys Jun 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down

16 changes: 11 additions & 5 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
	read: R,
	bytes_read: u64,
	total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
	/// Returns a new FixedLengthReader.
	pub fn new(read: R, total_bytes: u64) -> Self {
 Self { read, bytes_read: 0, total_bytes }
	}

	/// Returns whether there are remaining bytes or not.
	#[inline]
	pub fn bytes_remain(&mut self) -> bool {
 self.bytes_read != self.total_bytes
	}

	/// Consume the remaning bytes.
	#[inline]
	pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
 copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
	read: R,
	/// Tells whether we have read from this reader or not yet.
	pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
	/// Returns a new ReadTrackingReader.
	pub fn new(read: R) -> Self {
 Self { read, have_read: false }
	}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
	}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
	#[inline]
	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
	#[inline]
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
	#[inline]
	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Expose some useful tlv macros by mariocynicys · Pull Request #1551 · lightningdevkit/rust-lightning · GitHub
Skip to content
Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mariocynicys
wants to merge
8
commits into

from

 Closed


Expose some useful tlv macros
#1551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
a3cec7b

Exposing minimal macro set


mariocynicys Jun 15, 2022
64de58e

Prefixing imports with `$crate::` in ser/deser macros so they work wi…


mariocynicys Jun 16, 2022
5c8807d

TLV types MUST be strictly increasing (< and not <=)


mariocynicys Jun 17, 2022
319de94

Fix a typo


mariocynicys Jun 17, 2022
402aeb4

Add docs for exposed (de)serialization macros


mariocynicys Jun 17, 2022
4bab16e

Fix some macro docs


mariocynicys Jun 18, 2022
594c101

Prefix usage of exported macros with `$crate` so users don't have to …


mariocynicys Jun 20, 2022
3cab634

These comparisons are always false


mariocynicys Jun 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down

16 changes: 11 additions & 5 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
	read: R,
	bytes_read: u64,
	total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
	/// Returns a new FixedLengthReader.
	pub fn new(read: R, total_bytes: u64) -> Self {
 Self { read, bytes_read: 0, total_bytes }
	}

	/// Returns whether there are remaining bytes or not.
	#[inline]
	pub fn bytes_remain(&mut self) -> bool {
 self.bytes_read != self.total_bytes
	}

	/// Consume the remaning bytes.
	#[inline]
	pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
 copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
	read: R,
	/// Tells whether we have read from this reader or not yet.
	pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
	/// Returns a new ReadTrackingReader.
	pub fn new(read: R) -> Self {
 Self { read, have_read: false }
	}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
	}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
	#[inline]
	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
	#[inline]
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
	#[inline]
	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Expose some useful tlv macros by mariocynicys · Pull Request #1551 · lightningdevkit/rust-lightning · GitHub
Skip to content
Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mariocynicys
wants to merge
8
commits into

from

 Closed


Expose some useful tlv macros
#1551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
a3cec7b

Exposing minimal macro set


mariocynicys Jun 15, 2022
64de58e

Prefixing imports with `$crate::` in ser/deser macros so they work wi…


mariocynicys Jun 16, 2022
5c8807d

TLV types MUST be strictly increasing (< and not <=)


mariocynicys Jun 17, 2022
319de94

Fix a typo


mariocynicys Jun 17, 2022
402aeb4

Add docs for exposed (de)serialization macros


mariocynicys Jun 17, 2022
4bab16e

Fix some macro docs


mariocynicys Jun 18, 2022
594c101

Prefix usage of exported macros with `$crate` so users don't have to …


mariocynicys Jun 20, 2022
3cab634

These comparisons are always false


mariocynicys Jun 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down

16 changes: 11 additions & 5 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
	read: R,
	bytes_read: u64,
	total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
	/// Returns a new FixedLengthReader.
	pub fn new(read: R, total_bytes: u64) -> Self {
 Self { read, bytes_read: 0, total_bytes }
	}

	/// Returns whether there are remaining bytes or not.
	#[inline]
	pub fn bytes_remain(&mut self) -> bool {
 self.bytes_read != self.total_bytes
	}

	/// Consume the remaning bytes.
	#[inline]
	pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
 copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
	read: R,
	/// Tells whether we have read from this reader or not yet.
	pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
	/// Returns a new ReadTrackingReader.
	pub fn new(read: R) -> Self {
 Self { read, have_read: false }
	}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
	}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
	#[inline]
	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
	#[inline]
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
	#[inline]
	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Expose some useful tlv macros by mariocynicys · Pull Request #1551 · lightningdevkit/rust-lightning · GitHub
Skip to content
Expose some useful tlv macros#1551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

mariocynicys
wants to merge
8
commits into

from

 Closed


Expose some useful tlv macros
#1551
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
a3cec7b

Exposing minimal macro set


mariocynicys Jun 15, 2022
64de58e

Prefixing imports with `$crate::` in ser/deser macros so they work wi…


mariocynicys Jun 16, 2022
5c8807d

TLV types MUST be strictly increasing (< and not <=)


mariocynicys Jun 17, 2022
319de94

Fix a typo


mariocynicys Jun 17, 2022
402aeb4

Add docs for exposed (de)serialization macros


mariocynicys Jun 17, 2022
4bab16e

Fix some macro docs


mariocynicys Jun 18, 2022
594c101

Prefix usage of exported macros with `$crate` so users don't have to …


mariocynicys Jun 20, 2022
3cab634

These comparisons are always false


mariocynicys Jun 21, 2022

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


2 changes: 1 addition & 1 deletion
lightning/src/ln/msgs.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -790,7 +790,7 @@ pub struct CommitmentUpdate {

/// Messages could have optional fields to use with extended features
/// As we wish to serialize these differently from Option<T>s (Options get a tag byte, but
/// OptionalFeild simply gets Present if there are enough bytes to read into it), we have a
/// OptionalField simply gets Present if there are enough bytes to read into it), we have a
/// separate enum type for them.
/// (C-not exported) due to a free generic in T
#[derive(Clone, Debug, PartialEq)]
Expand Down

2 changes: 1 addition & 1 deletion
lightning/src/util/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@
pub(crate) mod fuzz_wrappers;

#[macro_use]
pub(crate) mod ser_macros;
pub mod ser_macros;

pub mod events;
pub mod errors;
Expand Down

16 changes: 11 additions & 5 deletions
lightning/src/util/ser.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -91,21 +91,24 @@ impl Writer for LengthCalculatingWriter {

/// Essentially std::io::Take but a bit simpler and with a method to walk the underlying stream
/// forward to ensure we always consume exactly the fixed length specified.
pub(crate) struct FixedLengthReader<R: Read> {
pub struct FixedLengthReader<R: Read> {
	read: R,
	bytes_read: u64,
	total_bytes: u64,
}
impl<R: Read> FixedLengthReader<R> {
	/// Returns a new FixedLengthReader.
	pub fn new(read: R, total_bytes: u64) -> Self {
 Self { read, bytes_read: 0, total_bytes }
	}

	/// Returns whether there are remaining bytes or not.
	#[inline]
	pub fn bytes_remain(&mut self) -> bool {
 self.bytes_read != self.total_bytes
	}

	/// Consume the remaning bytes.
	#[inline]
	pub fn eat_remaining(&mut self) -> Result<(), DecodeError> {
 copy(self, &mut sink()).unwrap();
Expand DownExpand Up@@ -136,11 +139,13 @@ impl<R: Read> Read for FixedLengthReader<R> {

/// A Read which tracks whether any bytes have been read at all. This allows us to distinguish
/// between "EOF reached before we started" and "EOF reached mid-read".
pub(crate) struct ReadTrackingReader<R: Read> {
pub struct ReadTrackingReader<R: Read> {
	read: R,
	/// Tells whether we have read from this reader or not yet.
	pub have_read: bool,
}
impl<R: Read> ReadTrackingReader<R> {
	/// Returns a new ReadTrackingReader.
	pub fn new(read: R) -> Self {
 Self { read, have_read: false }
	}
Expand DownExpand Up@@ -237,7 +242,8 @@ impl<T: Readable> MaybeReadable for T {
	}
}

pub(crate) struct OptionDeserWrapper<T: Readable>(pub Option<T>);
/// Wrapper to read a required (non-optional) TLV record.
pub struct OptionDeserWrapper<T: Readable>(pub Option<T>);
impl<T: Readable> Readable for OptionDeserWrapper<T> {
	#[inline]
	fn read<R: Read>(reader: &mut R) -> Result<Self, DecodeError> {
Expand All@@ -246,7 +252,7 @@ impl<T: Readable> Readable for OptionDeserWrapper<T> {
}

/// Wrapper to write each element of a Vec with no length prefix
pub(crate) struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
pub struct VecWriteWrapper<'a, T: Writeable>(pub &'a Vec<T>);
impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
	#[inline]
	fn write<W: Writer>(&self, writer: &mut W) -> Result<(), io::Error> {
Expand All@@ -258,7 +264,7 @@ impl<'a, T: Writeable> Writeable for VecWriteWrapper<'a, T> {
}

/// Wrapper to read elements from a given stream until it reaches the end of the stream.
pub(crate) struct VecReadWrapper<T>(pub Vec<T>);
pub struct VecReadWrapper<T>(pub Vec<T>);
impl<T: MaybeReadable> Readable for VecReadWrapper<T> {
	#[inline]
	fn read<R: Read>(mut reader: &mut R) -> Result<Self, DecodeError> {
Expand Down
Loading