Skip to content

Ensure we wipe pending un-accepted channel requests on err/discon. - #2501

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept
Aug 17, 2023
Merged

Ensure we wipe pending un-accepted channel requests on err/discon.#2501
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept

Conversation

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Two trivial followups to #2428.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.
0184727 switched around the logic
for inbound channel construction to assign the outbound SCID alias
after constructing the `InboundV1Channel` object. Thus, the SCID
alias argument is now unused, and we remove it here.
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.29% 🎉

Comparison is base (fe0f845) 90.38% compared to head (ef5a387) 90.68%.
Report is 7 commits behind head on main.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@ Coverage Diff @@## main #2501 +/- ##
==========================================
+ Coverage 90.38% 90.68% +0.29% 
==========================================
Files 106 106 Lines 56302 57903 +1601 Branches 56302 57903 +1601 ==========================================
+ Hits 50890 52507 +1617 + Misses 5412 5396 -16 
Files ChangedCoverage Δ
lightning/src/ln/channel.rs89.46% <100.00%> (ø)
lightning/src/ln/channelmanager.rs85.52% <100.00%> (+<0.01%)⬆️
lightning/src/ln/functional_tests.rs98.14% <100.00%> (ø)

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wpaulino
wpaulino previously approved these changes Aug 16, 2023

@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.

The docs on ChannelContext::set_outbound_scid_alias state:

	/// Only allowed immediately after deserialization if get_outbound_scid_alias returns 0,
/// indicating we were written by LDK prior to 0.0.106 which did not set outbound SCID aliases.

Seems this is kind of outdated now?

dunxen
dunxen previously approved these changes Aug 16, 2023
...and replace an assertion with a debug_assertion
@TheBlueMatt
TheBlueMatt dismissed stale reviews from dunxen and wpaulino via ef5a387August 17, 2023 03:36
@tnull
tnull merged commit f609fcf into lightningdevkit:mainAug 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt@codecov-commenter@tnull@dunxen@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" + '
Ensure we wipe pending un-accepted channel requests on err/discon. by TheBlueMatt · Pull Request #2501 · lightningdevkit/rust-lightning · GitHub
Skip to content

Ensure we wipe pending un-accepted channel requests on err/discon. - #2501

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept
Aug 17, 2023
Merged

Ensure we wipe pending un-accepted channel requests on err/discon.#2501
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept

Conversation

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Two trivial followups to #2428.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.
0184727 switched around the logic
for inbound channel construction to assign the outbound SCID alias
after constructing the `InboundV1Channel` object. Thus, the SCID
alias argument is now unused, and we remove it here.
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.29% 🎉

Comparison is base (fe0f845) 90.38% compared to head (ef5a387) 90.68%.
Report is 7 commits behind head on main.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@ Coverage Diff @@## main #2501 +/- ##
==========================================
+ Coverage 90.38% 90.68% +0.29% 
==========================================
Files 106 106 Lines 56302 57903 +1601 Branches 56302 57903 +1601 ==========================================
+ Hits 50890 52507 +1617 + Misses 5412 5396 -16 
Files ChangedCoverage Δ
lightning/src/ln/channel.rs89.46% <100.00%> (ø)
lightning/src/ln/channelmanager.rs85.52% <100.00%> (+<0.01%)⬆️
lightning/src/ln/functional_tests.rs98.14% <100.00%> (ø)

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wpaulino
wpaulino previously approved these changes Aug 16, 2023

@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.

The docs on ChannelContext::set_outbound_scid_alias state:

	/// Only allowed immediately after deserialization if get_outbound_scid_alias returns 0,
/// indicating we were written by LDK prior to 0.0.106 which did not set outbound SCID aliases.

Seems this is kind of outdated now?

dunxen
dunxen previously approved these changes Aug 16, 2023
...and replace an assertion with a debug_assertion
@TheBlueMatt
TheBlueMatt dismissed stale reviews from dunxen and wpaulino via ef5a387August 17, 2023 03:36
@tnull
tnull merged commit f609fcf into lightningdevkit:mainAug 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt@codecov-commenter@tnull@dunxen@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('^' + ".*" + ' Ensure we wipe pending un-accepted channel requests on err/discon. by TheBlueMatt · Pull Request #2501 · lightningdevkit/rust-lightning · GitHub
Skip to content

Ensure we wipe pending un-accepted channel requests on err/discon. - #2501

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept
Aug 17, 2023
Merged

Ensure we wipe pending un-accepted channel requests on err/discon.#2501
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept

Conversation

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Two trivial followups to #2428.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.
0184727 switched around the logic
for inbound channel construction to assign the outbound SCID alias
after constructing the `InboundV1Channel` object. Thus, the SCID
alias argument is now unused, and we remove it here.
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.29% 🎉

Comparison is base (fe0f845) 90.38% compared to head (ef5a387) 90.68%.
Report is 7 commits behind head on main.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@ Coverage Diff @@## main #2501 +/- ##
==========================================
+ Coverage 90.38% 90.68% +0.29% 
==========================================
Files 106 106 Lines 56302 57903 +1601 Branches 56302 57903 +1601 ==========================================
+ Hits 50890 52507 +1617 + Misses 5412 5396 -16 
Files ChangedCoverage Δ
lightning/src/ln/channel.rs89.46% <100.00%> (ø)
lightning/src/ln/channelmanager.rs85.52% <100.00%> (+<0.01%)⬆️
lightning/src/ln/functional_tests.rs98.14% <100.00%> (ø)

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wpaulino
wpaulino previously approved these changes Aug 16, 2023

@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.

The docs on ChannelContext::set_outbound_scid_alias state:

	/// Only allowed immediately after deserialization if get_outbound_scid_alias returns 0,
/// indicating we were written by LDK prior to 0.0.106 which did not set outbound SCID aliases.

Seems this is kind of outdated now?

dunxen
dunxen previously approved these changes Aug 16, 2023
...and replace an assertion with a debug_assertion
@TheBlueMatt
TheBlueMatt dismissed stale reviews from dunxen and wpaulino via ef5a387August 17, 2023 03:36
@tnull
tnull merged commit f609fcf into lightningdevkit:mainAug 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt@codecov-commenter@tnull@dunxen@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('^' + ".*" + ' Ensure we wipe pending un-accepted channel requests on err/discon. by TheBlueMatt · Pull Request #2501 · lightningdevkit/rust-lightning · GitHub
Skip to content

Ensure we wipe pending un-accepted channel requests on err/discon. - #2501

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept
Aug 17, 2023
Merged

Ensure we wipe pending un-accepted channel requests on err/discon.#2501
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept

Conversation

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Two trivial followups to #2428.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.
0184727 switched around the logic
for inbound channel construction to assign the outbound SCID alias
after constructing the `InboundV1Channel` object. Thus, the SCID
alias argument is now unused, and we remove it here.
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.29% 🎉

Comparison is base (fe0f845) 90.38% compared to head (ef5a387) 90.68%.
Report is 7 commits behind head on main.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@ Coverage Diff @@## main #2501 +/- ##
==========================================
+ Coverage 90.38% 90.68% +0.29% 
==========================================
Files 106 106 Lines 56302 57903 +1601 Branches 56302 57903 +1601 ==========================================
+ Hits 50890 52507 +1617 + Misses 5412 5396 -16 
Files ChangedCoverage Δ
lightning/src/ln/channel.rs89.46% <100.00%> (ø)
lightning/src/ln/channelmanager.rs85.52% <100.00%> (+<0.01%)⬆️
lightning/src/ln/functional_tests.rs98.14% <100.00%> (ø)

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wpaulino
wpaulino previously approved these changes Aug 16, 2023

@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.

The docs on ChannelContext::set_outbound_scid_alias state:

	/// Only allowed immediately after deserialization if get_outbound_scid_alias returns 0,
/// indicating we were written by LDK prior to 0.0.106 which did not set outbound SCID aliases.

Seems this is kind of outdated now?

dunxen
dunxen previously approved these changes Aug 16, 2023
...and replace an assertion with a debug_assertion
@TheBlueMatt
TheBlueMatt dismissed stale reviews from dunxen and wpaulino via ef5a387August 17, 2023 03:36
@tnull
tnull merged commit f609fcf into lightningdevkit:mainAug 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt@codecov-commenter@tnull@dunxen@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" + ' Ensure we wipe pending un-accepted channel requests on err/discon. by TheBlueMatt · Pull Request #2501 · lightningdevkit/rust-lightning · GitHub
Skip to content

Ensure we wipe pending un-accepted channel requests on err/discon. - #2501

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept
Aug 17, 2023
Merged

Ensure we wipe pending un-accepted channel requests on err/discon.#2501
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept

Conversation

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Two trivial followups to #2428.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.
0184727 switched around the logic
for inbound channel construction to assign the outbound SCID alias
after constructing the `InboundV1Channel` object. Thus, the SCID
alias argument is now unused, and we remove it here.
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.29% 🎉

Comparison is base (fe0f845) 90.38% compared to head (ef5a387) 90.68%.
Report is 7 commits behind head on main.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@ Coverage Diff @@## main #2501 +/- ##
==========================================
+ Coverage 90.38% 90.68% +0.29% 
==========================================
Files 106 106 Lines 56302 57903 +1601 Branches 56302 57903 +1601 ==========================================
+ Hits 50890 52507 +1617 + Misses 5412 5396 -16 
Files ChangedCoverage Δ
lightning/src/ln/channel.rs89.46% <100.00%> (ø)
lightning/src/ln/channelmanager.rs85.52% <100.00%> (+<0.01%)⬆️
lightning/src/ln/functional_tests.rs98.14% <100.00%> (ø)

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wpaulino
wpaulino previously approved these changes Aug 16, 2023

@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.

The docs on ChannelContext::set_outbound_scid_alias state:

	/// Only allowed immediately after deserialization if get_outbound_scid_alias returns 0,
/// indicating we were written by LDK prior to 0.0.106 which did not set outbound SCID aliases.

Seems this is kind of outdated now?

dunxen
dunxen previously approved these changes Aug 16, 2023
...and replace an assertion with a debug_assertion
@TheBlueMatt
TheBlueMatt dismissed stale reviews from dunxen and wpaulino via ef5a387August 17, 2023 03:36
@tnull
tnull merged commit f609fcf into lightningdevkit:mainAug 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt@codecov-commenter@tnull@dunxen@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('^' + ".*" + ' Ensure we wipe pending un-accepted channel requests on err/discon. by TheBlueMatt · Pull Request #2501 · lightningdevkit/rust-lightning · GitHub
Skip to content

Ensure we wipe pending un-accepted channel requests on err/discon. - #2501

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept
Aug 17, 2023
Merged

Ensure we wipe pending un-accepted channel requests on err/discon.#2501
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept

Conversation

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Two trivial followups to #2428.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.
0184727 switched around the logic
for inbound channel construction to assign the outbound SCID alias
after constructing the `InboundV1Channel` object. Thus, the SCID
alias argument is now unused, and we remove it here.
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.29% 🎉

Comparison is base (fe0f845) 90.38% compared to head (ef5a387) 90.68%.
Report is 7 commits behind head on main.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@ Coverage Diff @@## main #2501 +/- ##
==========================================
+ Coverage 90.38% 90.68% +0.29% 
==========================================
Files 106 106 Lines 56302 57903 +1601 Branches 56302 57903 +1601 ==========================================
+ Hits 50890 52507 +1617 + Misses 5412 5396 -16 
Files ChangedCoverage Δ
lightning/src/ln/channel.rs89.46% <100.00%> (ø)
lightning/src/ln/channelmanager.rs85.52% <100.00%> (+<0.01%)⬆️
lightning/src/ln/functional_tests.rs98.14% <100.00%> (ø)

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wpaulino
wpaulino previously approved these changes Aug 16, 2023

@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.

The docs on ChannelContext::set_outbound_scid_alias state:

	/// Only allowed immediately after deserialization if get_outbound_scid_alias returns 0,
/// indicating we were written by LDK prior to 0.0.106 which did not set outbound SCID aliases.

Seems this is kind of outdated now?

dunxen
dunxen previously approved these changes Aug 16, 2023
...and replace an assertion with a debug_assertion
@TheBlueMatt
TheBlueMatt dismissed stale reviews from dunxen and wpaulino via ef5a387August 17, 2023 03:36
@tnull
tnull merged commit f609fcf into lightningdevkit:mainAug 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt@codecov-commenter@tnull@dunxen@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); } })(); })(); Ensure we wipe pending un-accepted channel requests on err/discon. by TheBlueMatt · Pull Request #2501 · lightningdevkit/rust-lightning · GitHub
Skip to content

Ensure we wipe pending un-accepted channel requests on err/discon. - #2501

Merged
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept
Aug 17, 2023
Merged

Ensure we wipe pending un-accepted channel requests on err/discon.#2501
tnull merged 3 commits into
lightningdevkit:mainfrom
TheBlueMatt:2023-08-err-pre-accept

Conversation

@TheBlueMatt

Copy link
Copy Markdown
Collaborator

Two trivial followups to #2428.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.

If we have a pending inbound un-accepted channel but receive an
error message for it from our peer, or our peer disconnects, we
should remove the pending entry, ensuring any attempts to accept
it fail.
0184727 switched around the logic
for inbound channel construction to assign the outbound SCID alias
after constructing the `InboundV1Channel` object. Thus, the SCID
alias argument is now unused, and we remove it here.
@codecov-commenter

codecov-commenter commented Aug 16, 2023

Copy link
Copy Markdown

Codecov Report

Patch coverage: 100.00% and project coverage change: +0.29% 🎉

Comparison is base (fe0f845) 90.38% compared to head (ef5a387) 90.68%.
Report is 7 commits behind head on main.

❗ Your organization is not using the GitHub App Integration. As a result you may experience degraded service beginning May 15th. Please install the Github App Integration for your organization. Read more.

Additional details and impacted files
@@ Coverage Diff @@## main #2501 +/- ##
==========================================
+ Coverage 90.38% 90.68% +0.29% 
==========================================
Files 106 106 Lines 56302 57903 +1601 Branches 56302 57903 +1601 ==========================================
+ Hits 50890 52507 +1617 + Misses 5412 5396 -16 
Files ChangedCoverage Δ
lightning/src/ln/channel.rs89.46% <100.00%> (ø)
lightning/src/ln/channelmanager.rs85.52% <100.00%> (+<0.01%)⬆️
lightning/src/ln/functional_tests.rs98.14% <100.00%> (ø)

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

wpaulino
wpaulino previously approved these changes Aug 16, 2023

@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.

The docs on ChannelContext::set_outbound_scid_alias state:

	/// Only allowed immediately after deserialization if get_outbound_scid_alias returns 0,
/// indicating we were written by LDK prior to 0.0.106 which did not set outbound SCID aliases.

Seems this is kind of outdated now?

dunxen
dunxen previously approved these changes Aug 16, 2023
...and replace an assertion with a debug_assertion
@TheBlueMatt
TheBlueMatt dismissed stale reviews from dunxen and wpaulino via ef5a387August 17, 2023 03:36
@tnull
tnull merged commit f609fcf into lightningdevkit:mainAug 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@TheBlueMatt@codecov-commenter@tnull@dunxen@wpaulino