') + ')', '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); } })(); })(); Add FilesystemStoreV2Error for v1 data detection by benthecarman · Pull Request #4573 · lightningdevkit/rust-lightning · GitHub
Skip to content

Add FilesystemStoreV2Error for v1 data detection - #4573

Merged
tnull merged 1 commit into
lightningdevkit:mainfrom
benthecarman:fs-store-err
Apr 22, 2026
Merged

Add FilesystemStoreV2Error for v1 data detection#4573
tnull merged 1 commit into
lightningdevkit:mainfrom
benthecarman:fs-store-err

Conversation

@benthecarman

@benthecarmanbenthecarman commented Apr 21, 2026

Copy link
Copy Markdown
Contributor

FilesystemStoreV2::new previously returned io::Error with ErrorKind::InvalidData when the data directory contained top-level files left behind by FilesystemStore (v1). That forced us to match on an error that could potentially be given by our normal io calls. This adds a dedicated FilesystemStoreV2Error enum with a V1DataDetected(PathBuf) so we can distinguish between normal io errors and an old V1 fs store.

suggested from: lightningdevkit/ldk-node#872 (comment)

@benthecarman
Add FilesystemStoreV2Error for v1 data detection
6112521
FilesystemStoreV2::new previously returned io::Error with
ErrorKind::InvalidData when the data directory contained top-level
files left behind by FilesystemStore (v1). That forced us to
match on an error that could potentially be given by our normal io
calls. This adds a dedicated FilesystemStoreV2Error enum with a
V1DataDetected(PathBuf) so we can distinguish between normal io
errors and an old V1 fs store.
@benthecarman
benthecarman requested a review from tnullApril 21, 2026 18:55
@ldk-reviews-bot

ldk-reviews-bot commented Apr 21, 2026•
edited
Loading

Copy link
Copy Markdown

👋 Thanks for assigning @tnull as a reviewer!
I'll wait for their review and will help manage the review process.
Once they submit their review, I'll check if a second reviewer would be helpful.

@benthecarmanbenthecarman mentioned this pull request Apr 21, 2026
Merged
@ldk-claude-review-bot

ldk-claude-review-bot commented Apr 21, 2026

Copy link
Copy Markdown
Collaborator

I've reviewed the entire diff carefully. The change is well-scoped: it introduces a dedicated FilesystemStoreV2Error enum to replace the generic io::Error with ErrorKind::InvalidData, the Display/Error/From implementations are correct, the constructor properly uses ? for io::Error propagation via the From impl, and the test is updated to match on the specific enum variant rather than the error kind.

No issues found.

@codecov

codecovBot commented Apr 21, 2026•
edited
Loading

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 20.00000% with 16 lines in your changes missing coverage. Please review.
✅ Project coverage is 87.02%. Comparing base (5079a0b) to head (6112521).
⚠️ Report is 9 commits behind head on main.

Files with missing linesPatch %Lines
lightning-persister/src/fs_store/v2.rs20.00%16 Missing ⚠️
Additional details and impacted files
@@ Coverage Diff @@## main #4573 +/- ##
=======================================
Coverage 87.01% 87.02% =======================================
Files 161 161 Lines 108972 108979 +7 Branches 108972 108979 +7 =======================================
+ Hits 94827 94836 +9 + Misses 11660 11657 -3 - Partials 2485 2486 +1
FlagCoverage Δ
fuzzing-fake-hashes30.82% <0.00%> (-0.01%)⬇️
fuzzing-real-hashes22.66% <0.00%> (+<0.01%)⬆️
tests86.13% <20.00%> (+<0.01%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

tnull
tnull approved these changes Apr 22, 2026
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

@ldk-reviews-bot

ldk-reviews-bot commented Apr 22, 2026

Copy link
Copy Markdown

👋 The first review has been submitted!

Do you think this PR is ready for a second reviewer? If so, click here to assign a second reviewer.

@tnull
tnull merged commit 2313bd5 into lightningdevkit:mainApr 22, 2026
24 of 25 checks passed
@benthecarman
benthecarman deleted the fs-store-err branch April 22, 2026 13:05
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

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

4 participants

@benthecarman@ldk-reviews-bot@ldk-claude-review-bot@tnull