Skip to content

Unify common message handler traits into one trait - #3594

Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged

Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2025-02-peer-connected-trait

Conversation

@TheBlueMatt

@TheBlueMattTheBlueMatt commented Feb 9, 2025

Copy link
Copy Markdown
Collaborator

Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,
and provided_node_features methods, here we pull them all out
into one common trait and make all the message handlers extend it.

Since get_and_clear_pending_msg_events was also common we also
move that into the same trait, dropping the
MessageSendEventsProvider trait.

As requested by @tnull.

tnull
tnull reviewed Feb 10, 2025
View reviewed changes

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments

@TheBlueMatt
TheBlueMattforce-pushed the 2025-02-peer-connected-trait branch from 7289b80 to 6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt

TheBlueMatt commented Feb 10, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Oops, fixed.

@tnull

tnull commented Feb 10, 2025

Copy link
Copy Markdown
Contributor

Oops, fixed.

Unfortunately benchmark still failing:

error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed the 2025-02-peer-connected-trait branch from 6562669 to 3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt

TheBlueMatt commented Feb 10, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/

wpaulino
wpaulino previously approved these changes Feb 10, 2025
View reviewed changes
@TheBlueMatt

TheBlueMatt commented Feb 11, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.

@wpaulino

wpaulino commented Feb 26, 2025

Copy link
Copy Markdown
Contributor

Needs a rebase now that the dependent PR was merged

@TheBlueMatt
TheBlueMattforce-pushed the 2025-02-peer-connected-trait branch from 3fcd949 to d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt

TheBlueMatt commented Feb 26, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Rebased, I think we can land this now.

wpaulino
wpaulino previously approved these changes Feb 26, 2025
View reviewed changes
tnull
tnull previously approved these changes Mar 3, 2025
View reviewed changes

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!

@tnull

tnull commented Mar 3, 2025

Copy link
Copy Markdown
Contributor

@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.

@TheBlueMatt
TheBlueMatt dismissed stale reviews from tnull and wpaulino via 8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed the 2025-02-peer-connected-trait branch from d663e08 to 8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt

TheBlueMatt commented Mar 4, 2025

Copy link
Copy Markdown
CollaboratorAuthor

Sorry, rebased.

@tnull

tnull commented Mar 4, 2025

Copy link
Copy Markdown
Contributor

Sorry, rebased.

CI unfortunately still broken:

error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed the 2025-02-peer-connected-trait branch from 8e25fe9 to 5291676CompareMarch 5, 2025 01:26
@TheBlueMatt

TheBlueMatt commented Mar 5, 2025•
edited
Loading

Copy link
Copy Markdown
CollaboratorAuthor

Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.

@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed the 2025-02-peer-connected-trait branch from 5291676 to 10a78d2CompareMarch 5, 2025 01:27
tnull
tnull approved these changes Mar 5, 2025
View reviewed changes

@tnulltnull left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@tnull
tnull requested a review from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino merged commit cf1a27e into lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino mentioned this pull request Mar 5, 2025
Merged
@jkczyzjkczyz mentioned this pull request Mar 6, 2025
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino
, '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" + '
Unify common message handler traits into one trait by TheBlueMatt · Pull Request #3594 · lightningdevkit/rust-lightning · GitHub
Skip to content
Unify common message handler traits into one trait - #3594
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged
Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Feb 9, 2025

Copy link


Copy Markdown

Collaborator
Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,

and provided_node_features methods, here we pull them all out

into one common trait and make all the message handlers extend it.
Since get_and_clear_pending_msg_events was also common we also

move that into the same trait, dropping the
MessageSendEventsProvider trait.
As requested by @tnull.
tnull
tnull
reviewed
Feb 10, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
7289b80 to
6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@tnull
tnull
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
Oops, fixed.
Unfortunately benchmark still failing:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
6562669 to
3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/
wpaulino
wpaulino
previously approved these changes
Feb 10, 2025
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Feb 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.
@wpaulino
wpaulino
commented
Feb 26, 2025

Copy link


Copy Markdown

Contributor
Needs a rebase now that the dependent PR was merged
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
3fcd949 to
d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt
TheBlueMatt
commented
Feb 26, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Rebased, I think we can land this now.
wpaulino
wpaulino
previously approved these changes
Feb 26, 2025
View reviewed changes
tnull
tnull
previously approved these changes
Mar 3, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!
@tnull
tnull
commented
Mar 3, 2025

Copy link


Copy Markdown

Contributor
@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.
@TheBlueMatt
TheBlueMatt
dismissed stale reviews from tnull and wpaulino
via
8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
d663e08 to
8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt
TheBlueMatt
commented
Mar 4, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Sorry, rebased.
@tnull
tnull
commented
Mar 4, 2025

Copy link


Copy Markdown

Contributor
Sorry, rebased.
CI unfortunately still broken:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
8e25fe9 to
5291676CompareMarch 5, 2025 01:26
@TheBlueMatt
TheBlueMatt
commented
Mar 5, 2025•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.
@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
5291676 to
10a78d2CompareMarch 5, 2025 01:27
tnull
tnull
approved these changes
Mar 5, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
requested a review
from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino
merged commit cf1a27e
into
lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino
mentioned this pull request
Mar 5, 2025
 Merged

@jkczyzjkczyz
mentioned this pull request
Mar 6, 2025
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino

, '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('^' + ".*" + '
Unify common message handler traits into one trait by TheBlueMatt · Pull Request #3594 · lightningdevkit/rust-lightning · GitHub
Skip to content
Unify common message handler traits into one trait - #3594
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged
Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Feb 9, 2025

Copy link


Copy Markdown

Collaborator
Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,

and provided_node_features methods, here we pull them all out

into one common trait and make all the message handlers extend it.
Since get_and_clear_pending_msg_events was also common we also

move that into the same trait, dropping the
MessageSendEventsProvider trait.
As requested by @tnull.
tnull
tnull
reviewed
Feb 10, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
7289b80 to
6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@tnull
tnull
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
Oops, fixed.
Unfortunately benchmark still failing:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
6562669 to
3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/
wpaulino
wpaulino
previously approved these changes
Feb 10, 2025
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Feb 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.
@wpaulino
wpaulino
commented
Feb 26, 2025

Copy link


Copy Markdown

Contributor
Needs a rebase now that the dependent PR was merged
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
3fcd949 to
d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt
TheBlueMatt
commented
Feb 26, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Rebased, I think we can land this now.
wpaulino
wpaulino
previously approved these changes
Feb 26, 2025
View reviewed changes
tnull
tnull
previously approved these changes
Mar 3, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!
@tnull
tnull
commented
Mar 3, 2025

Copy link


Copy Markdown

Contributor
@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.
@TheBlueMatt
TheBlueMatt
dismissed stale reviews from tnull and wpaulino
via
8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
d663e08 to
8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt
TheBlueMatt
commented
Mar 4, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Sorry, rebased.
@tnull
tnull
commented
Mar 4, 2025

Copy link


Copy Markdown

Contributor
Sorry, rebased.
CI unfortunately still broken:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
8e25fe9 to
5291676CompareMarch 5, 2025 01:26
@TheBlueMatt
TheBlueMatt
commented
Mar 5, 2025•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.
@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
5291676 to
10a78d2CompareMarch 5, 2025 01:27
tnull
tnull
approved these changes
Mar 5, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
requested a review
from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino
merged commit cf1a27e
into
lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino
mentioned this pull request
Mar 5, 2025
 Merged

@jkczyzjkczyz
mentioned this pull request
Mar 6, 2025
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino

, '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('^' + ".*" + '
Unify common message handler traits into one trait by TheBlueMatt · Pull Request #3594 · lightningdevkit/rust-lightning · GitHub
Skip to content
Unify common message handler traits into one trait - #3594
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged
Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Feb 9, 2025

Copy link


Copy Markdown

Collaborator
Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,

and provided_node_features methods, here we pull them all out

into one common trait and make all the message handlers extend it.
Since get_and_clear_pending_msg_events was also common we also

move that into the same trait, dropping the
MessageSendEventsProvider trait.
As requested by @tnull.
tnull
tnull
reviewed
Feb 10, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
7289b80 to
6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@tnull
tnull
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
Oops, fixed.
Unfortunately benchmark still failing:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
6562669 to
3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/
wpaulino
wpaulino
previously approved these changes
Feb 10, 2025
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Feb 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.
@wpaulino
wpaulino
commented
Feb 26, 2025

Copy link


Copy Markdown

Contributor
Needs a rebase now that the dependent PR was merged
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
3fcd949 to
d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt
TheBlueMatt
commented
Feb 26, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Rebased, I think we can land this now.
wpaulino
wpaulino
previously approved these changes
Feb 26, 2025
View reviewed changes
tnull
tnull
previously approved these changes
Mar 3, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!
@tnull
tnull
commented
Mar 3, 2025

Copy link


Copy Markdown

Contributor
@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.
@TheBlueMatt
TheBlueMatt
dismissed stale reviews from tnull and wpaulino
via
8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
d663e08 to
8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt
TheBlueMatt
commented
Mar 4, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Sorry, rebased.
@tnull
tnull
commented
Mar 4, 2025

Copy link


Copy Markdown

Contributor
Sorry, rebased.
CI unfortunately still broken:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
8e25fe9 to
5291676CompareMarch 5, 2025 01:26
@TheBlueMatt
TheBlueMatt
commented
Mar 5, 2025•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.
@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
5291676 to
10a78d2CompareMarch 5, 2025 01:27
tnull
tnull
approved these changes
Mar 5, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
requested a review
from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino
merged commit cf1a27e
into
lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino
mentioned this pull request
Mar 5, 2025
 Merged

@jkczyzjkczyz
mentioned this pull request
Mar 6, 2025
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino

, '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" + '
Unify common message handler traits into one trait by TheBlueMatt · Pull Request #3594 · lightningdevkit/rust-lightning · GitHub
Skip to content
Unify common message handler traits into one trait - #3594
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged
Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Feb 9, 2025

Copy link


Copy Markdown

Collaborator
Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,

and provided_node_features methods, here we pull them all out

into one common trait and make all the message handlers extend it.
Since get_and_clear_pending_msg_events was also common we also

move that into the same trait, dropping the
MessageSendEventsProvider trait.
As requested by @tnull.
tnull
tnull
reviewed
Feb 10, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
7289b80 to
6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@tnull
tnull
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
Oops, fixed.
Unfortunately benchmark still failing:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
6562669 to
3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/
wpaulino
wpaulino
previously approved these changes
Feb 10, 2025
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Feb 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.
@wpaulino
wpaulino
commented
Feb 26, 2025

Copy link


Copy Markdown

Contributor
Needs a rebase now that the dependent PR was merged
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
3fcd949 to
d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt
TheBlueMatt
commented
Feb 26, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Rebased, I think we can land this now.
wpaulino
wpaulino
previously approved these changes
Feb 26, 2025
View reviewed changes
tnull
tnull
previously approved these changes
Mar 3, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!
@tnull
tnull
commented
Mar 3, 2025

Copy link


Copy Markdown

Contributor
@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.
@TheBlueMatt
TheBlueMatt
dismissed stale reviews from tnull and wpaulino
via
8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
d663e08 to
8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt
TheBlueMatt
commented
Mar 4, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Sorry, rebased.
@tnull
tnull
commented
Mar 4, 2025

Copy link


Copy Markdown

Contributor
Sorry, rebased.
CI unfortunately still broken:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
8e25fe9 to
5291676CompareMarch 5, 2025 01:26
@TheBlueMatt
TheBlueMatt
commented
Mar 5, 2025•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.
@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
5291676 to
10a78d2CompareMarch 5, 2025 01:27
tnull
tnull
approved these changes
Mar 5, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
requested a review
from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino
merged commit cf1a27e
into
lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino
mentioned this pull request
Mar 5, 2025
 Merged

@jkczyzjkczyz
mentioned this pull request
Mar 6, 2025
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino

, '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('^' + ".*" + '
Unify common message handler traits into one trait by TheBlueMatt · Pull Request #3594 · lightningdevkit/rust-lightning · GitHub
Skip to content
Unify common message handler traits into one trait - #3594
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged
Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Feb 9, 2025

Copy link


Copy Markdown

Collaborator
Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,

and provided_node_features methods, here we pull them all out

into one common trait and make all the message handlers extend it.
Since get_and_clear_pending_msg_events was also common we also

move that into the same trait, dropping the
MessageSendEventsProvider trait.
As requested by @tnull.
tnull
tnull
reviewed
Feb 10, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
7289b80 to
6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@tnull
tnull
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
Oops, fixed.
Unfortunately benchmark still failing:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
6562669 to
3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/
wpaulino
wpaulino
previously approved these changes
Feb 10, 2025
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Feb 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.
@wpaulino
wpaulino
commented
Feb 26, 2025

Copy link


Copy Markdown

Contributor
Needs a rebase now that the dependent PR was merged
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
3fcd949 to
d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt
TheBlueMatt
commented
Feb 26, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Rebased, I think we can land this now.
wpaulino
wpaulino
previously approved these changes
Feb 26, 2025
View reviewed changes
tnull
tnull
previously approved these changes
Mar 3, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!
@tnull
tnull
commented
Mar 3, 2025

Copy link


Copy Markdown

Contributor
@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.
@TheBlueMatt
TheBlueMatt
dismissed stale reviews from tnull and wpaulino
via
8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
d663e08 to
8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt
TheBlueMatt
commented
Mar 4, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Sorry, rebased.
@tnull
tnull
commented
Mar 4, 2025

Copy link


Copy Markdown

Contributor
Sorry, rebased.
CI unfortunately still broken:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
8e25fe9 to
5291676CompareMarch 5, 2025 01:26
@TheBlueMatt
TheBlueMatt
commented
Mar 5, 2025•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.
@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
5291676 to
10a78d2CompareMarch 5, 2025 01:27
tnull
tnull
approved these changes
Mar 5, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
requested a review
from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino
merged commit cf1a27e
into
lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino
mentioned this pull request
Mar 5, 2025
 Merged

@jkczyzjkczyz
mentioned this pull request
Mar 6, 2025
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino

, '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('^' + ".*" + '
Unify common message handler traits into one trait by TheBlueMatt · Pull Request #3594 · lightningdevkit/rust-lightning · GitHub
Skip to content
Unify common message handler traits into one trait - #3594
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged
Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Feb 9, 2025

Copy link


Copy Markdown

Collaborator
Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,

and provided_node_features methods, here we pull them all out

into one common trait and make all the message handlers extend it.
Since get_and_clear_pending_msg_events was also common we also

move that into the same trait, dropping the
MessageSendEventsProvider trait.
As requested by @tnull.
tnull
tnull
reviewed
Feb 10, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
7289b80 to
6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@tnull
tnull
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
Oops, fixed.
Unfortunately benchmark still failing:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
6562669 to
3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/
wpaulino
wpaulino
previously approved these changes
Feb 10, 2025
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Feb 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.
@wpaulino
wpaulino
commented
Feb 26, 2025

Copy link


Copy Markdown

Contributor
Needs a rebase now that the dependent PR was merged
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
3fcd949 to
d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt
TheBlueMatt
commented
Feb 26, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Rebased, I think we can land this now.
wpaulino
wpaulino
previously approved these changes
Feb 26, 2025
View reviewed changes
tnull
tnull
previously approved these changes
Mar 3, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!
@tnull
tnull
commented
Mar 3, 2025

Copy link


Copy Markdown

Contributor
@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.
@TheBlueMatt
TheBlueMatt
dismissed stale reviews from tnull and wpaulino
via
8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
d663e08 to
8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt
TheBlueMatt
commented
Mar 4, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Sorry, rebased.
@tnull
tnull
commented
Mar 4, 2025

Copy link


Copy Markdown

Contributor
Sorry, rebased.
CI unfortunately still broken:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
8e25fe9 to
5291676CompareMarch 5, 2025 01:26
@TheBlueMatt
TheBlueMatt
commented
Mar 5, 2025•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.
@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
5291676 to
10a78d2CompareMarch 5, 2025 01:27
tnull
tnull
approved these changes
Mar 5, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
requested a review
from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino
merged commit cf1a27e
into
lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino
mentioned this pull request
Mar 5, 2025
 Merged

@jkczyzjkczyz
mentioned this pull request
Mar 6, 2025
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino

, '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); }
})();
})();
Unify common message handler traits into one trait by TheBlueMatt · Pull Request #3594 · lightningdevkit/rust-lightning · GitHub
Skip to content
Unify common message handler traits into one trait - #3594
Merged
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Mar 5, 2025
Merged
Unify common message handler traits into one trait#3594
wpaulino merged 3 commits into
lightningdevkit:mainfrom 
TheBlueMatt:2025-02-peer-connected-trait
Conversation
@TheBlueMatt
@TheBlueMattTheBlueMatt
commented
Feb 9, 2025

Copy link


Copy Markdown

Collaborator
Instead of having each *MessageHandler implement the same
peer_connected, peer_disconnected, provided_init_features,

and provided_node_features methods, here we pull them all out

into one common trait and make all the message handlers extend it.
Since get_and_clear_pending_msg_events was also common we also

move that into the same trait, dropping the
MessageSendEventsProvider trait.
As requested by @tnull.
tnull
tnull
reviewed
Feb 10, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool! Unfortunately currently breaks RUSTFLAGS=--cfg=async_payments
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
7289b80 to
6562669CompareFebruary 10, 2025 14:10
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Oops, fixed.
@tnull
tnull
commented
Feb 10, 2025

Copy link


Copy Markdown

Contributor
Oops, fixed.
Unfortunately benchmark still failing:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15865:29
|
15865 | use crate::events::{Event, MessageSendEvent};
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
|
= help: consider importing this enum through its public re-export instead:
crate::ln::channelmanager::MessageSendEvent
warning: unused import: `Mutex`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/ln/channelmanager.rs:15881:25
|
15881 | use crate::sync::{Arc, Mutex, RwLock};
| ^^^^^
|
= note: `#[warn(unused_imports)]` on by default
warning: unused import: `RouteHop`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3678:44
|
3678 | use crate::routing::router::{bench_utils, RouteHop};
| ^^^^^^^^
warning: unused imports: `ChannelFeatures` and `NodeFeatures`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3680:31
|
3680 | use crate::types::features::{ChannelFeatures, NodeFeatures};
| ^^^^^^^^^^^^^^^ ^^^^^^^^^^^^
warning: unused variable: `network_graph`
--> /home/runner/work/rust-lightning/rust-lightning/lightning/src/routing/scoring.rs:3684:8
|
3684 | let (network_graph, mut scorer) = bench_utils::read_graph_scorer(&logger).unwrap();
| ^^^^^^^^^^^^^ help: if this is intentional, prefix it with an underscore: `_network_graph`
|
= note: `#[warn(unused_variables)]` on by default

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
6562669 to
3fcd949CompareFebruary 10, 2025 15:49
@TheBlueMatt
TheBlueMatt
commented
Feb 10, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Grr, I really need to fix the CI script so I can run it locally top-to-bottom :/
wpaulino
wpaulino
previously approved these changes
Feb 10, 2025
View reviewed changes
@TheBlueMatt
TheBlueMatt
commented
Feb 11, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Gonna at least wait for #3575 and maybe one of the followups for it. Should be pretty straightforward to rebase this.
@wpaulino
wpaulino
commented
Feb 26, 2025

Copy link


Copy Markdown

Contributor
Needs a rebase now that the dependent PR was merged
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
3fcd949 to
d663e08CompareFebruary 26, 2025 21:39
@TheBlueMatt
TheBlueMatt
commented
Feb 26, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Rebased, I think we can land this now.
wpaulino
wpaulino
previously approved these changes
Feb 26, 2025
View reviewed changes
tnull
tnull
previously approved these changes
Mar 3, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, LGTM!
@tnull
tnull
commented
Mar 3, 2025

Copy link


Copy Markdown

Contributor
@TheBlueMatt Ah, seems unfortunately this needs another rebase before it can land.
@TheBlueMatt
TheBlueMatt
dismissed stale reviews from tnull and wpaulino
via
8e25fe9March 4, 2025 02:04
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
d663e08 to
8e25fe9CompareMarch 4, 2025 02:04
@TheBlueMatt
TheBlueMatt
commented
Mar 4, 2025

Copy link


Copy Markdown

CollaboratorAuthor
Sorry, rebased.
@tnull
tnull
commented
Mar 4, 2025

Copy link


Copy Markdown

Contributor
Sorry, rebased.
CI unfortunately still broken:
error[E0432]: unresolved import `crate::events::MessageSendEvent`
--> lightning/src/ln/dual_funding_tests.rs:14:25
|
14 | crate::events::{Event, MessageSendEvent},
| ^^^^^^^^^^^^^^^^ no `MessageSendEvent` in `events`
For more information about this error, try `rustc --explain E0432`.
error: could not compile `lightning` due to previous error

@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
8e25fe9 to
5291676CompareMarch 5, 2025 01:26
@TheBlueMatt
TheBlueMatt
commented
Mar 5, 2025•

edited

Loading

Copy link


Copy Markdown

CollaboratorAuthor
Grrr, I fixed it locally and forgot to push. Had to rebase again anyway.
@TheBlueMatt
Move common message handler methods into a common trait
5da1d73
Instead of having each `*MessageHandler` implement the same
`peer_connected`, `peer_disconnected`, `provided_init_features`,
and `provided_node_features` methods, here we pull them all out
into one common trait and make all the message handlers extend it.
Since `get_and_clear_pending_msg_events` was also common we also
move that into the same trait, dropping the
`MessageSendEventsProvider` trait.
Best reviewed with `--color-moved`
@TheBlueMatt
Move MessageSendEvent to ln::msgs from events
a0d0bb4
`MessageSendEvent` got placed in the `events` module next to
`Event` but it really doesn't make a whole lot of sense to be
there (despite the superficially similar name). `MessageSendEvent`s
aren't really "events" so much as simply queued messages, handled
by the `PeerManager` rather than the user.
Further, they're used entirely by structs implementing the traits
in `ln::msgs` and basically define an enum over `ln::msgs` structs.
Thus, it only really makes sense to have them in `ln::msgs`, which
we do here.
@TheBlueMatt
Remove several unused imports in bench-specific modules
10a78d2
@TheBlueMatt
TheBlueMattforce-pushed
the
2025-02-peer-connected-trait
branch
from
5291676 to
10a78d2CompareMarch 5, 2025 01:27
tnull
tnull
approved these changes
Mar 5, 2025
View reviewed changes
@tnulltnull
left a comment


Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM
@tnull
tnull
requested a review
from wpaulinoMarch 5, 2025 08:19
@wpaulino
wpaulino
merged commit cf1a27e
into
lightningdevkit:mainMar 5, 2025
@wpaulinowpaulino
mentioned this pull request
Mar 5, 2025
 Merged

@jkczyzjkczyz
mentioned this pull request
Mar 6, 2025
 Merged

Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers

@tnulltnulltnull approved these changes
@wpaulinowpaulinowpaulino approved these changes

Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

3 participants

@TheBlueMatt@tnull@wpaulino