') + ')', '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('^' + ".*" + ', '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" + ', '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('^' + ".*" + ', '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); } })(); })(); #2964 Followups by TheBlueMatt · Pull Request #3003 · lightningdevkit/rust-lightning · GitHub
Skip to content

#2964 Followups - #3003

Merged
G8XSU merged 2 commits into
lightningdevkit:mainfrom
TheBlueMatt:2024-04-2964-followups
Apr 25, 2024
Merged

#2964 Followups#3003
G8XSU merged 2 commits into
lightningdevkit:mainfrom
TheBlueMatt:2024-04-2964-followups

Conversation

@TheBlueMatt

@TheBlueMattTheBlueMatt commented Apr 18, 2024

Copy link
Copy Markdown
Collaborator

Followups from #2964 (review)

@TheBlueMatt
Correct ChannelMonitor::is_fully_resolved docs
71fef35
The block count at which the monitor will become prunable was
changed by an update while the PR was pending but not propagated
to the docs.
@TheBlueMattTheBlueMatt added this to the 0.0.123 milestone Apr 18, 2024
@codecov-commenter

codecov-commenter commented Apr 18, 2024•
edited
Loading

Copy link
Copy Markdown

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 89.21%. Comparing base (195e666) to head (fd0c3e4).
Report is 6 commits behind head on main.

❗ Your organization needs to install the Codecov GitHub app to enable full functionality.

Additional details and impacted files
@@ Coverage Diff @@## main #3003 +/- ##
==========================================
+ Coverage 89.08% 89.21% +0.12% 
==========================================
Files 118 118 Lines 97400 98065 +665 Branches 97400 98065 +665 ==========================================
+ Hits 86773 87487 +714 + Misses 8383 8339 -44 + Partials 2244 2239 -5

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

G8XSU
G8XSU previously approved these changes Apr 18, 2024
View reviewed changes
G8XSU
G8XSU reviewed Apr 18, 2024
View reviewed changes
Comment threadlightning/src/chain/channelmonitor.rs Outdated
// Claimed all funds but `balances_empty_height` is None. It is set to the
// current block height.
log_debug!(logger,
"ChannelMonitor funded at {} is now fully resolved. It will become prunable in {} blocks",

@G8XSUG8XSUApr 18, 2024

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.

Suggested change
"ChannelMonitor funded at {} is now fully resolved. It will become prunable in {} blocks",
"ChannelMonitor funded at {} is now fully resolved. It will be archived in {} blocks",

since we are sticking with the archive terminology.

@TheBlueMattTheBlueMattApr 22, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Choose a reason for hiding this comment

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

Went with "archivable" because we don't automatically archive, the user still has to do something.

@TheBlueMatt
TheBlueMattforce-pushed the 2024-04-2964-followups branch from 5f45831 to fd0c3e4CompareApril 22, 2024 12:24
@TheBlueMatt

TheBlueMatt commented Apr 22, 2024

Copy link
Copy Markdown
CollaboratorAuthor

Squash-pushed the last commit

@G8XSU
G8XSU merged commit 8701b1b into lightningdevkit:mainApr 25, 2024
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

2 more reviewers
@G8XSUG8XSUG8XSU approved these changes
@jbesraajbesraajbesraa approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

0.0.123

Development

Successfully merging this pull request may close these issues.

4 participants

@TheBlueMatt@codecov-commenter@G8XSU@jbesraa