Skip to content

Implement KVStore for TestStore#4069

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
TheBlueMatt merged 2 commits into from
Sep 16, 2025
Merged

Implement KVStore for TestStore#4069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
828e10d
Move `TestStore` logic to `_internal` methods
tnull Sep 12, 2025
012bb7a
Implement `KVStore` for `TestStore`
tnull Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 29 additions & 33 deletions lightning/src/util/persist.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

let monitor_name = mon.persistence_key();
assert_eq!(
persister_0
.kv_store
.list(
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string()
)
.unwrap()
.len() as u64,
KVStoreSync::list(
&*persister_0.kv_store,
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string()
)
.unwrap()
.len() as u64,
mon.get_latest_update_id() % persister_0_max_pending_updates,
"Wrong number of updates stored in persister 0",
);
Expand All@@ -1276,14 +1275,13 @@ mod tests {
assert_eq!(mon.get_latest_update_id(), $expected_update_id);
let monitor_name = mon.persistence_key();
assert_eq!(
persister_1
.kv_store
.list(
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string()
)
.unwrap()
.len() as u64,
KVStoreSync::list(
&*persister_1.kv_store,
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string()
)
.unwrap()
.len() as u64,
mon.get_latest_update_id() % persister_1_max_pending_updates,
"Wrong number of updates stored in persister 1",
);
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
let (_, monitor) = &persisted_chan_data[0];
let monitor_name = monitor.persistence_key();
persister_0
.kv_store
.write(
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string(),
UpdateName::from(1).as_str(),
vec![0u8; 1],
)
.unwrap();
KVStoreSync::write(
&*persister_0.kv_store,
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string(),
UpdateName::from(1).as_str(),
vec![0u8; 1],
)
.unwrap();

// Do the stale update cleanup
persister_0.cleanup_stale_updates(false).unwrap();

// Confirm the stale update is unreadable/gone
assert!(persister_0
.kv_store
.read(
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string(),
UpdateName::from(1).as_str()
)
.is_err());
assert!(KVStoreSync::read(
&*persister_0.kv_store,
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
&monitor_name.to_string(),
UpdateName::from(1).as_str()
)
.is_err());
}

fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down
68 changes: 61 additions & 7 deletions lightning/src/util/test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
let persisted_bytes = Mutex::new(new_hash_map());
Self { persisted_bytes, read_only }
}
}

impl KVStoreSync for TestStore {
fn read(
fn read_internal(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
) -> io::Result<Vec<u8>> {
let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
}
}

fn write(
fn write_internal(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
) -> io::Result<()> {
if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
Ok(())
}

fn remove(
fn remove_internal(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
) -> io::Result<()> {
if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
Ok(())
}

fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
fn list_internal(
&self, primary_namespace: &str, secondary_namespace: &str,
) -> io::Result<Vec<String>> {
let mut persisted_lock = self.persisted_bytes.lock().unwrap();

let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
}
}

impl KVStore for TestStore {
fn read(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.
Box::pin(async move { res })
}
fn write(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
Box::pin(async move { res })
}
fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
Box::pin(async move { res })
}
fn list(
&self, primary_namespace: &str, secondary_namespace: &str,
) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
let res = self.list_internal(primary_namespace, secondary_namespace);
Box::pin(async move { res })
}
}

impl KVStoreSync for TestStore {
fn read(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
) -> io::Result<Vec<u8>> {
self.read_internal(primary_namespace, secondary_namespace, key)
}

fn write(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
) -> io::Result<()> {
self.write_internal(primary_namespace, secondary_namespace, key, buf)
}

fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
) -> io::Result<()> {
self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
}

fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
self.list_internal(primary_namespace, secondary_namespace)
}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Implement `KVStore` for `TestStore` by tnull · Pull Request #4069 · lightningdevkit/rust-lightning · GitHub
Skip to content
Implement KVStore for TestStore#4069

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Sep 16, 2025
 Merged


Implement KVStore for TestStore#4069
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
828e10d

Move `TestStore` logic to `_internal` methods


tnull Sep 12, 2025
012bb7a

Implement `KVStore` for `TestStore`


tnull Sep 16, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


62 changes: 29 additions & 33 deletions
lightning/src/util/persist.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_0
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_0_max_pending_updates,
 "Wrong number of updates stored in persister 0",
 );
Expand All@@ -1276,14 +1275,13 @@ mod tests {
 assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_1
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_1.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_1_max_pending_updates,
 "Wrong number of updates stored in persister 1",
 );
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
 let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
 let (_, monitor) = &persisted_chan_data[0];
 let monitor_name = monitor.persistence_key();
 persister_0
 .kv_store
 .write(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();
 KVStoreSync::write(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();

 // Do the stale update cleanup
 persister_0.cleanup_stale_updates(false).unwrap();

 // Confirm the stale update is unreadable/gone
 assert!(persister_0
 .kv_store
 .read(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
 assert!(KVStoreSync::read(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
	}

	fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down

68 changes: 61 additions & 7 deletions
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
 let persisted_bytes = Mutex::new(new_hash_map());
 Self { persisted_bytes, read_only }
	}
}

impl KVStoreSync for TestStore {
	fn read(
	fn read_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
 }
	}

	fn write(
	fn write_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn remove(
	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
	fn list_internal(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> io::Result<Vec<String>> {
 let mut persisted_lock = self.persisted_bytes.lock().unwrap();

 let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
	}
}

impl KVStore for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
 let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.

 Box::pin(async move { res })
	}
	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
 Box::pin(async move { res })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
 Box::pin(async move { res })
	}
	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
 let res = self.list_internal(primary_namespace, secondary_namespace);
 Box::pin(async move { res })
	}
}

impl KVStoreSync for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 self.read_internal(primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 self.write_internal(primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> io::Result<()> {
 self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 self.list_internal(primary_namespace, secondary_namespace)
	}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Sep 16, 2025
 Merged


Implement KVStore for TestStore#4069
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
828e10d

Move `TestStore` logic to `_internal` methods


tnull Sep 12, 2025
012bb7a

Implement `KVStore` for `TestStore`


tnull Sep 16, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


62 changes: 29 additions & 33 deletions
lightning/src/util/persist.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_0
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_0_max_pending_updates,
 "Wrong number of updates stored in persister 0",
 );
Expand All@@ -1276,14 +1275,13 @@ mod tests {
 assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_1
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_1.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_1_max_pending_updates,
 "Wrong number of updates stored in persister 1",
 );
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
 let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
 let (_, monitor) = &persisted_chan_data[0];
 let monitor_name = monitor.persistence_key();
 persister_0
 .kv_store
 .write(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();
 KVStoreSync::write(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();

 // Do the stale update cleanup
 persister_0.cleanup_stale_updates(false).unwrap();

 // Confirm the stale update is unreadable/gone
 assert!(persister_0
 .kv_store
 .read(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
 assert!(KVStoreSync::read(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
	}

	fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down

68 changes: 61 additions & 7 deletions
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
 let persisted_bytes = Mutex::new(new_hash_map());
 Self { persisted_bytes, read_only }
	}
}

impl KVStoreSync for TestStore {
	fn read(
	fn read_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
 }
	}

	fn write(
	fn write_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn remove(
	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
	fn list_internal(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> io::Result<Vec<String>> {
 let mut persisted_lock = self.persisted_bytes.lock().unwrap();

 let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
	}
}

impl KVStore for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
 let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.

 Box::pin(async move { res })
	}
	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
 Box::pin(async move { res })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
 Box::pin(async move { res })
	}
	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
 let res = self.list_internal(primary_namespace, secondary_namespace);
 Box::pin(async move { res })
	}
}

impl KVStoreSync for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 self.read_internal(primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 self.write_internal(primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> io::Result<()> {
 self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 self.list_internal(primary_namespace, secondary_namespace)
	}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Sep 16, 2025
 Merged


Implement KVStore for TestStore#4069
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
828e10d

Move `TestStore` logic to `_internal` methods


tnull Sep 12, 2025
012bb7a

Implement `KVStore` for `TestStore`


tnull Sep 16, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


62 changes: 29 additions & 33 deletions
lightning/src/util/persist.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_0
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_0_max_pending_updates,
 "Wrong number of updates stored in persister 0",
 );
Expand All@@ -1276,14 +1275,13 @@ mod tests {
 assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_1
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_1.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_1_max_pending_updates,
 "Wrong number of updates stored in persister 1",
 );
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
 let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
 let (_, monitor) = &persisted_chan_data[0];
 let monitor_name = monitor.persistence_key();
 persister_0
 .kv_store
 .write(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();
 KVStoreSync::write(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();

 // Do the stale update cleanup
 persister_0.cleanup_stale_updates(false).unwrap();

 // Confirm the stale update is unreadable/gone
 assert!(persister_0
 .kv_store
 .read(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
 assert!(KVStoreSync::read(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
	}

	fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down

68 changes: 61 additions & 7 deletions
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
 let persisted_bytes = Mutex::new(new_hash_map());
 Self { persisted_bytes, read_only }
	}
}

impl KVStoreSync for TestStore {
	fn read(
	fn read_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
 }
	}

	fn write(
	fn write_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn remove(
	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
	fn list_internal(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> io::Result<Vec<String>> {
 let mut persisted_lock = self.persisted_bytes.lock().unwrap();

 let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
	}
}

impl KVStore for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
 let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.

 Box::pin(async move { res })
	}
	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
 Box::pin(async move { res })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
 Box::pin(async move { res })
	}
	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
 let res = self.list_internal(primary_namespace, secondary_namespace);
 Box::pin(async move { res })
	}
}

impl KVStoreSync for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 self.read_internal(primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 self.write_internal(primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> io::Result<()> {
 self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 self.list_internal(primary_namespace, secondary_namespace)
	}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Sep 16, 2025
 Merged


Implement KVStore for TestStore#4069
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
828e10d

Move `TestStore` logic to `_internal` methods


tnull Sep 12, 2025
012bb7a

Implement `KVStore` for `TestStore`


tnull Sep 16, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


62 changes: 29 additions & 33 deletions
lightning/src/util/persist.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_0
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_0_max_pending_updates,
 "Wrong number of updates stored in persister 0",
 );
Expand All@@ -1276,14 +1275,13 @@ mod tests {
 assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_1
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_1.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_1_max_pending_updates,
 "Wrong number of updates stored in persister 1",
 );
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
 let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
 let (_, monitor) = &persisted_chan_data[0];
 let monitor_name = monitor.persistence_key();
 persister_0
 .kv_store
 .write(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();
 KVStoreSync::write(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();

 // Do the stale update cleanup
 persister_0.cleanup_stale_updates(false).unwrap();

 // Confirm the stale update is unreadable/gone
 assert!(persister_0
 .kv_store
 .read(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
 assert!(KVStoreSync::read(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
	}

	fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down

68 changes: 61 additions & 7 deletions
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
 let persisted_bytes = Mutex::new(new_hash_map());
 Self { persisted_bytes, read_only }
	}
}

impl KVStoreSync for TestStore {
	fn read(
	fn read_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
 }
	}

	fn write(
	fn write_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn remove(
	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
	fn list_internal(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> io::Result<Vec<String>> {
 let mut persisted_lock = self.persisted_bytes.lock().unwrap();

 let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
	}
}

impl KVStore for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
 let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.

 Box::pin(async move { res })
	}
	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
 Box::pin(async move { res })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
 Box::pin(async move { res })
	}
	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
 let res = self.list_internal(primary_namespace, secondary_namespace);
 Box::pin(async move { res })
	}
}

impl KVStoreSync for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 self.read_internal(primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 self.write_internal(primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> io::Result<()> {
 self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 self.list_internal(primary_namespace, secondary_namespace)
	}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Sep 16, 2025
 Merged


Implement KVStore for TestStore#4069
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
828e10d

Move `TestStore` logic to `_internal` methods


tnull Sep 12, 2025
012bb7a

Implement `KVStore` for `TestStore`


tnull Sep 16, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


62 changes: 29 additions & 33 deletions
lightning/src/util/persist.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_0
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_0_max_pending_updates,
 "Wrong number of updates stored in persister 0",
 );
Expand All@@ -1276,14 +1275,13 @@ mod tests {
 assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_1
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_1.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_1_max_pending_updates,
 "Wrong number of updates stored in persister 1",
 );
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
 let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
 let (_, monitor) = &persisted_chan_data[0];
 let monitor_name = monitor.persistence_key();
 persister_0
 .kv_store
 .write(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();
 KVStoreSync::write(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();

 // Do the stale update cleanup
 persister_0.cleanup_stale_updates(false).unwrap();

 // Confirm the stale update is unreadable/gone
 assert!(persister_0
 .kv_store
 .read(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
 assert!(KVStoreSync::read(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
	}

	fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down

68 changes: 61 additions & 7 deletions
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
 let persisted_bytes = Mutex::new(new_hash_map());
 Self { persisted_bytes, read_only }
	}
}

impl KVStoreSync for TestStore {
	fn read(
	fn read_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
 }
	}

	fn write(
	fn write_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn remove(
	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
	fn list_internal(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> io::Result<Vec<String>> {
 let mut persisted_lock = self.persisted_bytes.lock().unwrap();

 let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
	}
}

impl KVStore for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
 let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.

 Box::pin(async move { res })
	}
	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
 Box::pin(async move { res })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
 Box::pin(async move { res })
	}
	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
 let res = self.list_internal(primary_namespace, secondary_namespace);
 Box::pin(async move { res })
	}
}

impl KVStoreSync for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 self.read_internal(primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 self.write_internal(primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> io::Result<()> {
 self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 self.list_internal(primary_namespace, secondary_namespace)
	}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Sep 16, 2025
 Merged


Implement KVStore for TestStore#4069
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
828e10d

Move `TestStore` logic to `_internal` methods


tnull Sep 12, 2025
012bb7a

Implement `KVStore` for `TestStore`


tnull Sep 16, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


62 changes: 29 additions & 33 deletions
lightning/src/util/persist.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_0
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_0_max_pending_updates,
 "Wrong number of updates stored in persister 0",
 );
Expand All@@ -1276,14 +1275,13 @@ mod tests {
 assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_1
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_1.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_1_max_pending_updates,
 "Wrong number of updates stored in persister 1",
 );
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
 let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
 let (_, monitor) = &persisted_chan_data[0];
 let monitor_name = monitor.persistence_key();
 persister_0
 .kv_store
 .write(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();
 KVStoreSync::write(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();

 // Do the stale update cleanup
 persister_0.cleanup_stale_updates(false).unwrap();

 // Confirm the stale update is unreadable/gone
 assert!(persister_0
 .kv_store
 .read(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
 assert!(KVStoreSync::read(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
	}

	fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down

68 changes: 61 additions & 7 deletions
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
 let persisted_bytes = Mutex::new(new_hash_map());
 Self { persisted_bytes, read_only }
	}
}

impl KVStoreSync for TestStore {
	fn read(
	fn read_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
 }
	}

	fn write(
	fn write_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn remove(
	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
	fn list_internal(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> io::Result<Vec<String>> {
 let mut persisted_lock = self.persisted_bytes.lock().unwrap();

 let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
	}
}

impl KVStore for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
 let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.

 Box::pin(async move { res })
	}
	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
 Box::pin(async move { res })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
 Box::pin(async move { res })
	}
	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
 let res = self.list_internal(primary_namespace, secondary_namespace);
 Box::pin(async move { res })
	}
}

impl KVStoreSync for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 self.read_internal(primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 self.write_internal(primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> io::Result<()> {
 self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 self.list_internal(primary_namespace, secondary_namespace)
	}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading

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

New issue

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

 Sign up for GitHub

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

Already on GitHub?
Sign in
to your account

 Merged

TheBlueMatt
merged 2 commits into

from

Sep 16, 2025
 Merged


Implement KVStore for TestStore#4069
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
828e10d

Move `TestStore` logic to `_internal` methods


tnull Sep 12, 2025
012bb7a

Implement `KVStore` for `TestStore`


tnull Sep 16, 2025

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


62 changes: 29 additions & 33 deletions
lightning/src/util/persist.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1257,14 +1257,13 @@ mod tests {

 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_0
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_0_max_pending_updates,
 "Wrong number of updates stored in persister 0",
 );
Expand All@@ -1276,14 +1275,13 @@ mod tests {
 assert_eq!(mon.get_latest_update_id(), $expected_update_id);
 let monitor_name = mon.persistence_key();
 assert_eq!(
 persister_1
 .kv_store
 .list(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 KVStoreSync::list(
 &*persister_1.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string()
 )
 .unwrap()
 .len() as u64,
 mon.get_latest_update_id() % persister_1_max_pending_updates,
 "Wrong number of updates stored in persister 1",
 );
Expand DownExpand Up@@ -1481,28 +1479,26 @@ mod tests {
 let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
 let (_, monitor) = &persisted_chan_data[0];
 let monitor_name = monitor.persistence_key();
 persister_0
 .kv_store
 .write(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();
 KVStoreSync::write(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str(),
 vec![0u8; 1],
 )
 .unwrap();

 // Do the stale update cleanup
 persister_0.cleanup_stale_updates(false).unwrap();

 // Confirm the stale update is unreadable/gone
 assert!(persister_0
 .kv_store
 .read(
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
 assert!(KVStoreSync::read(
 &*persister_0.kv_store,
 CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
 &monitor_name.to_string(),
 UpdateName::from(1).as_str()
 )
 .is_err());
	}

	fn persist_fn<P: Deref, ChannelSigner: EcdsaChannelSigner>(_persist: P) -> bool
Expand Down

68 changes: 61 additions & 7 deletions
lightning/src/util/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
use crate::util::logger::{Logger, Record};
#[cfg(feature = "std")]
use crate::util::mut_global::MutGlobal;
use crate::util::persist::{KVStoreSync, MonitorName};
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};

Expand All@@ -84,7 +84,10 @@ use crate::io;
use crate::prelude::*;
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
use crate::sync::{Arc, Mutex};
use alloc::boxed::Box;
use core::future::Future;
use core::mem;
use core::pin::Pin;
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
use core::time::Duration;

Expand DownExpand Up@@ -863,10 +866,8 @@ impl TestStore {
 let persisted_bytes = Mutex::new(new_hash_map());
 Self { persisted_bytes, read_only }
	}
}

impl KVStoreSync for TestStore {
	fn read(
	fn read_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 let persisted_lock = self.persisted_bytes.lock().unwrap();
Expand All@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
 }
	}

	fn write(
	fn write_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn remove(
	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 if self.read_only {
Expand All@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
 Ok(())
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
	fn list_internal(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> io::Result<Vec<String>> {
 let mut persisted_lock = self.persisted_bytes.lock().unwrap();

 let prefixed = if secondary_namespace.is_empty() {
Expand All@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
	}
}

impl KVStore for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
 let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
Comment thread
tnull marked this conversation as resolved.

 Box::pin(async move { res })
	}
	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
 Box::pin(async move { res })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
 let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
 Box::pin(async move { res })
	}
	fn list(
 &self, primary_namespace: &str, secondary_namespace: &str,
	) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
 let res = self.list_internal(primary_namespace, secondary_namespace);
 Box::pin(async move { res })
	}
}

impl KVStoreSync for TestStore {
	fn read(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
	) -> io::Result<Vec<u8>> {
 self.read_internal(primary_namespace, secondary_namespace, key)
	}

	fn write(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
	) -> io::Result<()> {
 self.write_internal(primary_namespace, secondary_namespace, key, buf)
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> io::Result<()> {
 self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
	}

	fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
 self.list_internal(primary_namespace, secondary_namespace)
	}
}

unsafe impl Sync for TestStore {}
unsafe impl Send for TestStore {}

Expand Down
Loading