Skip to content

Asyncify test suite and reintroduce VSS-internal runtime#670

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
tnull merged 7 commits into from
Oct 28, 2025
Merged

Asyncify test suite and reintroduce VSS-internal runtime #670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
edff34c
Drop superfluous `cargo build` step
tnull Oct 14, 2025
ae98bef
Add missing error logs for `ReadFailed` cases
tnull Oct 14, 2025
b8cf41c
Drop `Condvar` and use `block_on` for `wait_next_event`
tnull Oct 16, 2025
05dab40
Async'ify our test suite
tnull Oct 16, 2025
8512c26
Add `async { ..await }` in remaining places
tnull Oct 20, 2025
e01ea05
Re-introduce internal runtime to `VssStore`
tnull Oct 20, 2025
8cad63b
Fix and run all tests under `cfg(vss_test)`
tnull Oct 20, 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
2 changes: 1 addition & 1 deletion .github/workflows/vss-integration.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
run: |
cd ldk-node
export TEST_VSS_BASE_URL="http://localhost:8080/vss"
RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss
13 changes: 10 additions & 3 deletions src/builder.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
if e.kind() == std::io::ErrorKind::NotFound {
Arc::new(RwLock::new(NodeMetrics::default()))
} else {
log_error!(logger, "Failed to read node metrics from store: {}", e);
return Err(BuildError::ReadFailed);
}
},
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
Arc::clone(&kv_store),
Arc::clone(&logger),
)),
Err(_) => {
Err(e) => {
log_error!(logger, "Failed to read payment data from store: {}", e);
return Err(BuildError::ReadFailed);
},
};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
if e.kind() == lightning::io::ErrorKind::NotFound {
Vec::new()
} else {
log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
return Err(BuildError::ReadFailed);
}
},
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
if e.kind() == std::io::ErrorKind::NotFound {
Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
} else {
log_error!(logger, "Failed to read network graph from store: {}", e);
return Err(BuildError::ReadFailed);
}
},
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
Arc::clone(&logger),
)))
} else {
log_error!(logger, "Failed to read scoring data from store: {}", e);
return Err(BuildError::ReadFailed);
}
},
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
);
let (_hash, channel_manager) =
<(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
log_error!(logger, "Failed to read channel manager from store: {}", e);
BuildError::ReadFailed
})?;
channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
Arc::clone(&logger),
))
} else {
log_error!(logger, "Failed to read output sweeper data from store: {}", e);
return Err(BuildError::ReadFailed);
}
},
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
if e.kind() == std::io::ErrorKind::NotFound {
Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
} else {
log_error!(logger, "Failed to read event queue from store: {}", e);
return Err(BuildError::ReadFailed);
}
},
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
if e.kind() == std::io::ErrorKind::NotFound {
Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
} else {
log_error!(logger, "Failed to read peer data from store: {}", e);
return Err(BuildError::ReadFailed);
}
},
Expand Down
48 changes: 4 additions & 44 deletions src/event.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
queue: Arc<Mutex<VecDeque<Event>>>,
waker: Arc<Mutex<Option<Waker>>>,
notifier: Condvar,
kv_store: Arc<DynStore>,
logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
let queue = Arc::new(Mutex::new(VecDeque::new()));
let waker = Arc::new(Mutex::new(None));
let notifier = Condvar::new();
Self { queue, waker, notifier, kv_store, logger }
Self { queue, waker, kv_store, logger }
}

pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
self.persist_queue(&locked_queue)?;
}

self.notifier.notify_one();

if let Some(waker) = self.waker.lock().unwrap().take() {
waker.wake();
}
Expand All@@ -327,19 +323,12 @@ where
EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
}

pub(crate) fn wait_next_event(&self) -> Event {
let locked_queue =
self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
locked_queue.front().unwrap().clone()
}

pub(crate) fn event_handled(&self) -> Result<(), Error> {
{
let mut locked_queue = self.queue.lock().unwrap();
locked_queue.pop_front();
self.persist_queue(&locked_queue)?;
}
self.notifier.notify_one();

if let Some(waker) = self.waker.lock().unwrap().take() {
waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
let queue = Arc::new(Mutex::new(read_queue.0));
let waker = Arc::new(Mutex::new(None));
let notifier = Condvar::new();
Ok(Self { queue, waker, notifier, kv_store, logger })
Ok(Self { queue, waker, kv_store, logger })
}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

// Check we get the expected event and that it is returned until we mark it handled.
for _ in 0..5 {
assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.
assert_eq!(event_queue.next_event_async().await, expected_event);
assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
}
Expand All@@ -1652,7 +1639,7 @@ mod tests {
.unwrap();
let deser_event_queue =
EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
assert_eq!(deser_event_queue.wait_next_event(), expected_event);
assert_eq!(deser_event_queue.next_event_async().await, expected_event);

event_queue.event_handled().unwrap();
assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
}
}
assert_eq!(event_queue.next_event(), None);

// Check we operate correctly, even when mixing and matching blocking and async API calls.
let (tx, mut rx) = tokio::sync::watch::channel(());
let thread_queue = Arc::clone(&event_queue);
let thread_event = expected_event.clone();
std::thread::spawn(move || {
let e = thread_queue.wait_next_event();
assert_eq!(e, thread_event);
thread_queue.event_handled().unwrap();
tx.send(()).unwrap();
});

let thread_queue = Arc::clone(&event_queue);
let thread_event = expected_event.clone();
std::thread::spawn(move || {
// Sleep a bit before we enqueue the events everybody is waiting for.
std::thread::sleep(Duration::from_millis(20));
thread_queue.add_event(thread_event.clone()).unwrap();
thread_queue.add_event(thread_event.clone()).unwrap();
});

let e = event_queue.next_event_async().await;
assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.
event_queue.event_handled().unwrap();

rx.changed().await.unwrap();
assert_eq!(event_queue.next_event(), None);
}
}
Loading
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" + '
Asyncify test suite and reintroduce VSS-internal runtime by tnull · Pull Request #670 · lightningdevkit/ldk-node · GitHub
Skip to content
Asyncify test suite and reintroduce VSS-internal runtime#670

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

tnull
merged 7 commits into

from

Oct 28, 2025
 Merged


Asyncify test suite and reintroduce VSS-internal runtime
#670
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
edff34c

Drop superfluous `cargo build` step


tnull Oct 14, 2025
ae98bef

Add missing error logs for `ReadFailed` cases


tnull Oct 14, 2025
b8cf41c

Drop `Condvar` and use `block_on` for `wait_next_event`


tnull Oct 16, 2025
05dab40

Async'ify our test suite


tnull Oct 16, 2025
8512c26

Add `async { ..await }` in remaining places


tnull Oct 20, 2025
e01ea05

Re-introduce internal runtime to `VssStore`


tnull Oct 20, 2025
8cad63b

Fix and run all tests under `cfg(vss_test)`


tnull Oct 20, 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


2 changes: 1 addition & 1 deletion
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

13 changes: 10 additions & 3 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(RwLock::new(NodeMetrics::default()))
 } else {
 log_error!(logger, "Failed to read node metrics from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 )),
 Err(_) => {
 Err(e) => {
 log_error!(logger, "Failed to read payment data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
 if e.kind() == lightning::io::ErrorKind::NotFound {
 Vec::new()
 } else {
 log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
 log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read network graph from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 )))
 } else {
 log_error!(logger, "Failed to read scoring data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
 );
 let (_hash, channel_manager) =
 <(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
 log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
 log_error!(logger, "Failed to read channel manager from store: {}", e);
 BuildError::ReadFailed
 })?;
 channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 ))
 } else {
 log_error!(logger, "Failed to read output sweeper data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read event queue from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read peer data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand Down

48 changes: 4 additions & 44 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
	queue: Arc<Mutex<VecDeque<Event>>>,
	waker: Arc<Mutex<Option<Waker>>>,
	notifier: Condvar,
	kv_store: Arc<DynStore>,
	logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
	pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
 let queue = Arc::new(Mutex::new(VecDeque::new()));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Self { queue, waker, notifier, kv_store, logger }
 Self { queue, waker, kv_store, logger }
	}

	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
 self.persist_queue(&locked_queue)?;
 }

 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
 }
Expand All@@ -327,19 +323,12 @@ where
 EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
	}

	pub(crate) fn wait_next_event(&self) -> Event {
 let locked_queue =
 self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
 locked_queue.front().unwrap().clone()
	}

	pub(crate) fn event_handled(&self) -> Result<(), Error> {
 {
 let mut locked_queue = self.queue.lock().unwrap();
 locked_queue.pop_front();
 self.persist_queue(&locked_queue)?;
 }
 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
 let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
 let queue = Arc::new(Mutex::new(read_queue.0));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Ok(Self { queue, waker, notifier, kv_store, logger })
 Ok(Self { queue, waker, kv_store, logger })
	}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

 // Check we get the expected event and that it is returned until we mark it handled.
 for _ in 0..5 {
 assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.

 assert_eq!(event_queue.next_event_async().await, expected_event);
 assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
 }
Expand All@@ -1652,7 +1639,7 @@ mod tests {
 .unwrap();
 let deser_event_queue =
 EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
 assert_eq!(deser_event_queue.wait_next_event(), expected_event);
 assert_eq!(deser_event_queue.next_event_async().await, expected_event);

 event_queue.event_handled().unwrap();
 assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
 }
 }
 assert_eq!(event_queue.next_event(), None);

 // Check we operate correctly, even when mixing and matching blocking and async API calls.
 let (tx, mut rx) = tokio::sync::watch::channel(());
 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 let e = thread_queue.wait_next_event();
 assert_eq!(e, thread_event);
 thread_queue.event_handled().unwrap();
 tx.send(()).unwrap();
 });

 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 // Sleep a bit before we enqueue the events everybody is waiting for.
 std::thread::sleep(Duration::from_millis(20));
 thread_queue.add_event(thread_event.clone()).unwrap();
 thread_queue.add_event(thread_event.clone()).unwrap();
 });

 let e = event_queue.next_event_async().await;
 assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.

 event_queue.event_handled().unwrap();

 rx.changed().await.unwrap();
 assert_eq!(event_queue.next_event(), None);
	}
}
Loading
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('^' + ".*" + '
Asyncify test suite and reintroduce VSS-internal runtime by tnull · Pull Request #670 · lightningdevkit/ldk-node · GitHub
Skip to content
Asyncify test suite and reintroduce VSS-internal runtime#670

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

tnull
merged 7 commits into

from

Oct 28, 2025
 Merged


Asyncify test suite and reintroduce VSS-internal runtime
#670
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
edff34c

Drop superfluous `cargo build` step


tnull Oct 14, 2025
ae98bef

Add missing error logs for `ReadFailed` cases


tnull Oct 14, 2025
b8cf41c

Drop `Condvar` and use `block_on` for `wait_next_event`


tnull Oct 16, 2025
05dab40

Async'ify our test suite


tnull Oct 16, 2025
8512c26

Add `async { ..await }` in remaining places


tnull Oct 20, 2025
e01ea05

Re-introduce internal runtime to `VssStore`


tnull Oct 20, 2025
8cad63b

Fix and run all tests under `cfg(vss_test)`


tnull Oct 20, 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


2 changes: 1 addition & 1 deletion
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

13 changes: 10 additions & 3 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(RwLock::new(NodeMetrics::default()))
 } else {
 log_error!(logger, "Failed to read node metrics from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 )),
 Err(_) => {
 Err(e) => {
 log_error!(logger, "Failed to read payment data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
 if e.kind() == lightning::io::ErrorKind::NotFound {
 Vec::new()
 } else {
 log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
 log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read network graph from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 )))
 } else {
 log_error!(logger, "Failed to read scoring data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
 );
 let (_hash, channel_manager) =
 <(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
 log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
 log_error!(logger, "Failed to read channel manager from store: {}", e);
 BuildError::ReadFailed
 })?;
 channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 ))
 } else {
 log_error!(logger, "Failed to read output sweeper data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read event queue from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read peer data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand Down

48 changes: 4 additions & 44 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
	queue: Arc<Mutex<VecDeque<Event>>>,
	waker: Arc<Mutex<Option<Waker>>>,
	notifier: Condvar,
	kv_store: Arc<DynStore>,
	logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
	pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
 let queue = Arc::new(Mutex::new(VecDeque::new()));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Self { queue, waker, notifier, kv_store, logger }
 Self { queue, waker, kv_store, logger }
	}

	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
 self.persist_queue(&locked_queue)?;
 }

 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
 }
Expand All@@ -327,19 +323,12 @@ where
 EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
	}

	pub(crate) fn wait_next_event(&self) -> Event {
 let locked_queue =
 self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
 locked_queue.front().unwrap().clone()
	}

	pub(crate) fn event_handled(&self) -> Result<(), Error> {
 {
 let mut locked_queue = self.queue.lock().unwrap();
 locked_queue.pop_front();
 self.persist_queue(&locked_queue)?;
 }
 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
 let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
 let queue = Arc::new(Mutex::new(read_queue.0));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Ok(Self { queue, waker, notifier, kv_store, logger })
 Ok(Self { queue, waker, kv_store, logger })
	}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

 // Check we get the expected event and that it is returned until we mark it handled.
 for _ in 0..5 {
 assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.

 assert_eq!(event_queue.next_event_async().await, expected_event);
 assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
 }
Expand All@@ -1652,7 +1639,7 @@ mod tests {
 .unwrap();
 let deser_event_queue =
 EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
 assert_eq!(deser_event_queue.wait_next_event(), expected_event);
 assert_eq!(deser_event_queue.next_event_async().await, expected_event);

 event_queue.event_handled().unwrap();
 assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
 }
 }
 assert_eq!(event_queue.next_event(), None);

 // Check we operate correctly, even when mixing and matching blocking and async API calls.
 let (tx, mut rx) = tokio::sync::watch::channel(());
 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 let e = thread_queue.wait_next_event();
 assert_eq!(e, thread_event);
 thread_queue.event_handled().unwrap();
 tx.send(()).unwrap();
 });

 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 // Sleep a bit before we enqueue the events everybody is waiting for.
 std::thread::sleep(Duration::from_millis(20));
 thread_queue.add_event(thread_event.clone()).unwrap();
 thread_queue.add_event(thread_event.clone()).unwrap();
 });

 let e = event_queue.next_event_async().await;
 assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.

 event_queue.event_handled().unwrap();

 rx.changed().await.unwrap();
 assert_eq!(event_queue.next_event(), None);
	}
}
Loading
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('^' + ".*" + '
Asyncify test suite and reintroduce VSS-internal runtime by tnull · Pull Request #670 · lightningdevkit/ldk-node · GitHub
Skip to content
Asyncify test suite and reintroduce VSS-internal runtime#670

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

tnull
merged 7 commits into

from

Oct 28, 2025
 Merged


Asyncify test suite and reintroduce VSS-internal runtime
#670
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
edff34c

Drop superfluous `cargo build` step


tnull Oct 14, 2025
ae98bef

Add missing error logs for `ReadFailed` cases


tnull Oct 14, 2025
b8cf41c

Drop `Condvar` and use `block_on` for `wait_next_event`


tnull Oct 16, 2025
05dab40

Async'ify our test suite


tnull Oct 16, 2025
8512c26

Add `async { ..await }` in remaining places


tnull Oct 20, 2025
e01ea05

Re-introduce internal runtime to `VssStore`


tnull Oct 20, 2025
8cad63b

Fix and run all tests under `cfg(vss_test)`


tnull Oct 20, 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


2 changes: 1 addition & 1 deletion
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

13 changes: 10 additions & 3 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(RwLock::new(NodeMetrics::default()))
 } else {
 log_error!(logger, "Failed to read node metrics from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 )),
 Err(_) => {
 Err(e) => {
 log_error!(logger, "Failed to read payment data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
 if e.kind() == lightning::io::ErrorKind::NotFound {
 Vec::new()
 } else {
 log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
 log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read network graph from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 )))
 } else {
 log_error!(logger, "Failed to read scoring data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
 );
 let (_hash, channel_manager) =
 <(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
 log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
 log_error!(logger, "Failed to read channel manager from store: {}", e);
 BuildError::ReadFailed
 })?;
 channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 ))
 } else {
 log_error!(logger, "Failed to read output sweeper data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read event queue from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read peer data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand Down

48 changes: 4 additions & 44 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
	queue: Arc<Mutex<VecDeque<Event>>>,
	waker: Arc<Mutex<Option<Waker>>>,
	notifier: Condvar,
	kv_store: Arc<DynStore>,
	logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
	pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
 let queue = Arc::new(Mutex::new(VecDeque::new()));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Self { queue, waker, notifier, kv_store, logger }
 Self { queue, waker, kv_store, logger }
	}

	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
 self.persist_queue(&locked_queue)?;
 }

 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
 }
Expand All@@ -327,19 +323,12 @@ where
 EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
	}

	pub(crate) fn wait_next_event(&self) -> Event {
 let locked_queue =
 self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
 locked_queue.front().unwrap().clone()
	}

	pub(crate) fn event_handled(&self) -> Result<(), Error> {
 {
 let mut locked_queue = self.queue.lock().unwrap();
 locked_queue.pop_front();
 self.persist_queue(&locked_queue)?;
 }
 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
 let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
 let queue = Arc::new(Mutex::new(read_queue.0));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Ok(Self { queue, waker, notifier, kv_store, logger })
 Ok(Self { queue, waker, kv_store, logger })
	}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

 // Check we get the expected event and that it is returned until we mark it handled.
 for _ in 0..5 {
 assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.

 assert_eq!(event_queue.next_event_async().await, expected_event);
 assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
 }
Expand All@@ -1652,7 +1639,7 @@ mod tests {
 .unwrap();
 let deser_event_queue =
 EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
 assert_eq!(deser_event_queue.wait_next_event(), expected_event);
 assert_eq!(deser_event_queue.next_event_async().await, expected_event);

 event_queue.event_handled().unwrap();
 assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
 }
 }
 assert_eq!(event_queue.next_event(), None);

 // Check we operate correctly, even when mixing and matching blocking and async API calls.
 let (tx, mut rx) = tokio::sync::watch::channel(());
 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 let e = thread_queue.wait_next_event();
 assert_eq!(e, thread_event);
 thread_queue.event_handled().unwrap();
 tx.send(()).unwrap();
 });

 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 // Sleep a bit before we enqueue the events everybody is waiting for.
 std::thread::sleep(Duration::from_millis(20));
 thread_queue.add_event(thread_event.clone()).unwrap();
 thread_queue.add_event(thread_event.clone()).unwrap();
 });

 let e = event_queue.next_event_async().await;
 assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.

 event_queue.event_handled().unwrap();

 rx.changed().await.unwrap();
 assert_eq!(event_queue.next_event(), None);
	}
}
Loading
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" + '
Asyncify test suite and reintroduce VSS-internal runtime by tnull · Pull Request #670 · lightningdevkit/ldk-node · GitHub
Skip to content
Asyncify test suite and reintroduce VSS-internal runtime#670

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

tnull
merged 7 commits into

from

Oct 28, 2025
 Merged


Asyncify test suite and reintroduce VSS-internal runtime
#670
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
edff34c

Drop superfluous `cargo build` step


tnull Oct 14, 2025
ae98bef

Add missing error logs for `ReadFailed` cases


tnull Oct 14, 2025
b8cf41c

Drop `Condvar` and use `block_on` for `wait_next_event`


tnull Oct 16, 2025
05dab40

Async'ify our test suite


tnull Oct 16, 2025
8512c26

Add `async { ..await }` in remaining places


tnull Oct 20, 2025
e01ea05

Re-introduce internal runtime to `VssStore`


tnull Oct 20, 2025
8cad63b

Fix and run all tests under `cfg(vss_test)`


tnull Oct 20, 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


2 changes: 1 addition & 1 deletion
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

13 changes: 10 additions & 3 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(RwLock::new(NodeMetrics::default()))
 } else {
 log_error!(logger, "Failed to read node metrics from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 )),
 Err(_) => {
 Err(e) => {
 log_error!(logger, "Failed to read payment data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
 if e.kind() == lightning::io::ErrorKind::NotFound {
 Vec::new()
 } else {
 log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
 log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read network graph from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 )))
 } else {
 log_error!(logger, "Failed to read scoring data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
 );
 let (_hash, channel_manager) =
 <(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
 log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
 log_error!(logger, "Failed to read channel manager from store: {}", e);
 BuildError::ReadFailed
 })?;
 channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 ))
 } else {
 log_error!(logger, "Failed to read output sweeper data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read event queue from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read peer data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand Down

48 changes: 4 additions & 44 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
	queue: Arc<Mutex<VecDeque<Event>>>,
	waker: Arc<Mutex<Option<Waker>>>,
	notifier: Condvar,
	kv_store: Arc<DynStore>,
	logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
	pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
 let queue = Arc::new(Mutex::new(VecDeque::new()));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Self { queue, waker, notifier, kv_store, logger }
 Self { queue, waker, kv_store, logger }
	}

	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
 self.persist_queue(&locked_queue)?;
 }

 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
 }
Expand All@@ -327,19 +323,12 @@ where
 EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
	}

	pub(crate) fn wait_next_event(&self) -> Event {
 let locked_queue =
 self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
 locked_queue.front().unwrap().clone()
	}

	pub(crate) fn event_handled(&self) -> Result<(), Error> {
 {
 let mut locked_queue = self.queue.lock().unwrap();
 locked_queue.pop_front();
 self.persist_queue(&locked_queue)?;
 }
 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
 let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
 let queue = Arc::new(Mutex::new(read_queue.0));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Ok(Self { queue, waker, notifier, kv_store, logger })
 Ok(Self { queue, waker, kv_store, logger })
	}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

 // Check we get the expected event and that it is returned until we mark it handled.
 for _ in 0..5 {
 assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.

 assert_eq!(event_queue.next_event_async().await, expected_event);
 assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
 }
Expand All@@ -1652,7 +1639,7 @@ mod tests {
 .unwrap();
 let deser_event_queue =
 EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
 assert_eq!(deser_event_queue.wait_next_event(), expected_event);
 assert_eq!(deser_event_queue.next_event_async().await, expected_event);

 event_queue.event_handled().unwrap();
 assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
 }
 }
 assert_eq!(event_queue.next_event(), None);

 // Check we operate correctly, even when mixing and matching blocking and async API calls.
 let (tx, mut rx) = tokio::sync::watch::channel(());
 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 let e = thread_queue.wait_next_event();
 assert_eq!(e, thread_event);
 thread_queue.event_handled().unwrap();
 tx.send(()).unwrap();
 });

 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 // Sleep a bit before we enqueue the events everybody is waiting for.
 std::thread::sleep(Duration::from_millis(20));
 thread_queue.add_event(thread_event.clone()).unwrap();
 thread_queue.add_event(thread_event.clone()).unwrap();
 });

 let e = event_queue.next_event_async().await;
 assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.

 event_queue.event_handled().unwrap();

 rx.changed().await.unwrap();
 assert_eq!(event_queue.next_event(), None);
	}
}
Loading
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('^' + ".*" + '
Asyncify test suite and reintroduce VSS-internal runtime by tnull · Pull Request #670 · lightningdevkit/ldk-node · GitHub
Skip to content
Asyncify test suite and reintroduce VSS-internal runtime#670

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

tnull
merged 7 commits into

from

Oct 28, 2025
 Merged


Asyncify test suite and reintroduce VSS-internal runtime
#670
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
edff34c

Drop superfluous `cargo build` step


tnull Oct 14, 2025
ae98bef

Add missing error logs for `ReadFailed` cases


tnull Oct 14, 2025
b8cf41c

Drop `Condvar` and use `block_on` for `wait_next_event`


tnull Oct 16, 2025
05dab40

Async'ify our test suite


tnull Oct 16, 2025
8512c26

Add `async { ..await }` in remaining places


tnull Oct 20, 2025
e01ea05

Re-introduce internal runtime to `VssStore`


tnull Oct 20, 2025
8cad63b

Fix and run all tests under `cfg(vss_test)`


tnull Oct 20, 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


2 changes: 1 addition & 1 deletion
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

13 changes: 10 additions & 3 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(RwLock::new(NodeMetrics::default()))
 } else {
 log_error!(logger, "Failed to read node metrics from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 )),
 Err(_) => {
 Err(e) => {
 log_error!(logger, "Failed to read payment data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
 if e.kind() == lightning::io::ErrorKind::NotFound {
 Vec::new()
 } else {
 log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
 log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read network graph from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 )))
 } else {
 log_error!(logger, "Failed to read scoring data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
 );
 let (_hash, channel_manager) =
 <(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
 log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
 log_error!(logger, "Failed to read channel manager from store: {}", e);
 BuildError::ReadFailed
 })?;
 channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 ))
 } else {
 log_error!(logger, "Failed to read output sweeper data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read event queue from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read peer data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand Down

48 changes: 4 additions & 44 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
	queue: Arc<Mutex<VecDeque<Event>>>,
	waker: Arc<Mutex<Option<Waker>>>,
	notifier: Condvar,
	kv_store: Arc<DynStore>,
	logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
	pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
 let queue = Arc::new(Mutex::new(VecDeque::new()));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Self { queue, waker, notifier, kv_store, logger }
 Self { queue, waker, kv_store, logger }
	}

	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
 self.persist_queue(&locked_queue)?;
 }

 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
 }
Expand All@@ -327,19 +323,12 @@ where
 EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
	}

	pub(crate) fn wait_next_event(&self) -> Event {
 let locked_queue =
 self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
 locked_queue.front().unwrap().clone()
	}

	pub(crate) fn event_handled(&self) -> Result<(), Error> {
 {
 let mut locked_queue = self.queue.lock().unwrap();
 locked_queue.pop_front();
 self.persist_queue(&locked_queue)?;
 }
 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
 let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
 let queue = Arc::new(Mutex::new(read_queue.0));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Ok(Self { queue, waker, notifier, kv_store, logger })
 Ok(Self { queue, waker, kv_store, logger })
	}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

 // Check we get the expected event and that it is returned until we mark it handled.
 for _ in 0..5 {
 assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.

 assert_eq!(event_queue.next_event_async().await, expected_event);
 assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
 }
Expand All@@ -1652,7 +1639,7 @@ mod tests {
 .unwrap();
 let deser_event_queue =
 EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
 assert_eq!(deser_event_queue.wait_next_event(), expected_event);
 assert_eq!(deser_event_queue.next_event_async().await, expected_event);

 event_queue.event_handled().unwrap();
 assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
 }
 }
 assert_eq!(event_queue.next_event(), None);

 // Check we operate correctly, even when mixing and matching blocking and async API calls.
 let (tx, mut rx) = tokio::sync::watch::channel(());
 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 let e = thread_queue.wait_next_event();
 assert_eq!(e, thread_event);
 thread_queue.event_handled().unwrap();
 tx.send(()).unwrap();
 });

 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 // Sleep a bit before we enqueue the events everybody is waiting for.
 std::thread::sleep(Duration::from_millis(20));
 thread_queue.add_event(thread_event.clone()).unwrap();
 thread_queue.add_event(thread_event.clone()).unwrap();
 });

 let e = event_queue.next_event_async().await;
 assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.

 event_queue.event_handled().unwrap();

 rx.changed().await.unwrap();
 assert_eq!(event_queue.next_event(), None);
	}
}
Loading
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('^' + ".*" + '
Asyncify test suite and reintroduce VSS-internal runtime by tnull · Pull Request #670 · lightningdevkit/ldk-node · GitHub
Skip to content
Asyncify test suite and reintroduce VSS-internal runtime#670

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

tnull
merged 7 commits into

from

Oct 28, 2025
 Merged


Asyncify test suite and reintroduce VSS-internal runtime
#670
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
edff34c

Drop superfluous `cargo build` step


tnull Oct 14, 2025
ae98bef

Add missing error logs for `ReadFailed` cases


tnull Oct 14, 2025
b8cf41c

Drop `Condvar` and use `block_on` for `wait_next_event`


tnull Oct 16, 2025
05dab40

Async'ify our test suite


tnull Oct 16, 2025
8512c26

Add `async { ..await }` in remaining places


tnull Oct 20, 2025
e01ea05

Re-introduce internal runtime to `VssStore`


tnull Oct 20, 2025
8cad63b

Fix and run all tests under `cfg(vss_test)`


tnull Oct 20, 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


2 changes: 1 addition & 1 deletion
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

13 changes: 10 additions & 3 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(RwLock::new(NodeMetrics::default()))
 } else {
 log_error!(logger, "Failed to read node metrics from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 )),
 Err(_) => {
 Err(e) => {
 log_error!(logger, "Failed to read payment data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
 if e.kind() == lightning::io::ErrorKind::NotFound {
 Vec::new()
 } else {
 log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
 log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read network graph from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 )))
 } else {
 log_error!(logger, "Failed to read scoring data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
 );
 let (_hash, channel_manager) =
 <(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
 log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
 log_error!(logger, "Failed to read channel manager from store: {}", e);
 BuildError::ReadFailed
 })?;
 channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 ))
 } else {
 log_error!(logger, "Failed to read output sweeper data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read event queue from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read peer data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand Down

48 changes: 4 additions & 44 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
	queue: Arc<Mutex<VecDeque<Event>>>,
	waker: Arc<Mutex<Option<Waker>>>,
	notifier: Condvar,
	kv_store: Arc<DynStore>,
	logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
	pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
 let queue = Arc::new(Mutex::new(VecDeque::new()));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Self { queue, waker, notifier, kv_store, logger }
 Self { queue, waker, kv_store, logger }
	}

	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
 self.persist_queue(&locked_queue)?;
 }

 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
 }
Expand All@@ -327,19 +323,12 @@ where
 EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
	}

	pub(crate) fn wait_next_event(&self) -> Event {
 let locked_queue =
 self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
 locked_queue.front().unwrap().clone()
	}

	pub(crate) fn event_handled(&self) -> Result<(), Error> {
 {
 let mut locked_queue = self.queue.lock().unwrap();
 locked_queue.pop_front();
 self.persist_queue(&locked_queue)?;
 }
 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
 let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
 let queue = Arc::new(Mutex::new(read_queue.0));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Ok(Self { queue, waker, notifier, kv_store, logger })
 Ok(Self { queue, waker, kv_store, logger })
	}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

 // Check we get the expected event and that it is returned until we mark it handled.
 for _ in 0..5 {
 assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.

 assert_eq!(event_queue.next_event_async().await, expected_event);
 assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
 }
Expand All@@ -1652,7 +1639,7 @@ mod tests {
 .unwrap();
 let deser_event_queue =
 EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
 assert_eq!(deser_event_queue.wait_next_event(), expected_event);
 assert_eq!(deser_event_queue.next_event_async().await, expected_event);

 event_queue.event_handled().unwrap();
 assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
 }
 }
 assert_eq!(event_queue.next_event(), None);

 // Check we operate correctly, even when mixing and matching blocking and async API calls.
 let (tx, mut rx) = tokio::sync::watch::channel(());
 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 let e = thread_queue.wait_next_event();
 assert_eq!(e, thread_event);
 thread_queue.event_handled().unwrap();
 tx.send(()).unwrap();
 });

 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 // Sleep a bit before we enqueue the events everybody is waiting for.
 std::thread::sleep(Duration::from_millis(20));
 thread_queue.add_event(thread_event.clone()).unwrap();
 thread_queue.add_event(thread_event.clone()).unwrap();
 });

 let e = event_queue.next_event_async().await;
 assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.

 event_queue.event_handled().unwrap();

 rx.changed().await.unwrap();
 assert_eq!(event_queue.next_event(), None);
	}
}
Loading
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); }
})();
})();
Asyncify test suite and reintroduce VSS-internal runtime by tnull · Pull Request #670 · lightningdevkit/ldk-node · GitHub
Skip to content
Asyncify test suite and reintroduce VSS-internal runtime#670

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

tnull
merged 7 commits into

from

Oct 28, 2025
 Merged


Asyncify test suite and reintroduce VSS-internal runtime
#670
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
edff34c

Drop superfluous `cargo build` step


tnull Oct 14, 2025
ae98bef

Add missing error logs for `ReadFailed` cases


tnull Oct 14, 2025
b8cf41c

Drop `Condvar` and use `block_on` for `wait_next_event`


tnull Oct 16, 2025
05dab40

Async'ify our test suite


tnull Oct 16, 2025
8512c26

Add `async { ..await }` in remaining places


tnull Oct 20, 2025
e01ea05

Re-introduce internal runtime to `VssStore`


tnull Oct 20, 2025
8cad63b

Fix and run all tests under `cfg(vss_test)`


tnull Oct 20, 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


2 changes: 1 addition & 1 deletion
.github/workflows/vss-integration.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,5 +44,5 @@ jobs:
 run: |
 cd ldk-node
 export TEST_VSS_BASE_URL="http://localhost:8080/vss"
 RUSTFLAGS="--cfg vss_test" cargo build --verbose --color always
 RUSTFLAGS="--cfg vss_test" cargo test io::vss_store
 RUSTFLAGS="--cfg vss_test" cargo test --test integration_tests_vss

13 changes: 10 additions & 3 deletions
src/builder.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1138,6 +1138,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(RwLock::new(NodeMetrics::default()))
 } else {
 log_error!(logger, "Failed to read node metrics from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1201,7 +1202,8 @@ fn build_with_store_internal(
 Arc::clone(&kv_store),
 Arc::clone(&logger),
 )),
 Err(_) => {
 Err(e) => {
 log_error!(logger, "Failed to read payment data from store: {}", e);
 return Err(BuildError::ReadFailed);
 },
	};
Expand DownExpand Up@@ -1334,7 +1336,7 @@ fn build_with_store_internal(
 if e.kind() == lightning::io::ErrorKind::NotFound {
 Vec::new()
 } else {
 log_error!(logger, "Failed to read channel monitors: {}", e.to_string());
 log_error!(logger, "Failed to read channel monitors from store: {}", e.to_string());
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1359,6 +1361,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(Graph::new(config.network.into(), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read network graph from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1379,6 +1382,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 )))
 } else {
 log_error!(logger, "Failed to read scoring data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand DownExpand Up@@ -1448,7 +1452,7 @@ fn build_with_store_internal(
 );
 let (_hash, channel_manager) =
 <(BlockHash, ChannelManager)>::read(&mut reader, read_args).map_err(|e| {
 log_error!(logger, "Failed to read channel manager from KVStore: {}", e);
 log_error!(logger, "Failed to read channel manager from store: {}", e);
 BuildError::ReadFailed
 })?;
 channel_manager
Expand DownExpand Up@@ -1677,6 +1681,7 @@ fn build_with_store_internal(
 Arc::clone(&logger),
 ))
 } else {
 log_error!(logger, "Failed to read output sweeper data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1689,6 +1694,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(EventQueue::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read event queue from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand All@@ -1700,6 +1706,7 @@ fn build_with_store_internal(
 if e.kind() == std::io::ErrorKind::NotFound {
 Arc::new(PeerStore::new(Arc::clone(&kv_store), Arc::clone(&logger)))
 } else {
 log_error!(logger, "Failed to read peer data from store: {}", e);
 return Err(BuildError::ReadFailed);
 }
 },
Expand Down

48 changes: 4 additions & 44 deletions
src/event.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ use core::future::Future;
use core::task::{Poll, Waker};
use std::collections::VecDeque;
use std::ops::Deref;
use std::sync::{Arc, Condvar, Mutex};
use std::sync::{Arc, Mutex};

use bitcoin::blockdata::locktime::absolute::LockTime;
use bitcoin::secp256k1::PublicKey;
Expand DownExpand Up@@ -287,7 +287,6 @@ where
{
	queue: Arc<Mutex<VecDeque<Event>>>,
	waker: Arc<Mutex<Option<Waker>>>,
	notifier: Condvar,
	kv_store: Arc<DynStore>,
	logger: L,
}
Expand All@@ -299,8 +298,7 @@ where
	pub(crate) fn new(kv_store: Arc<DynStore>, logger: L) -> Self {
 let queue = Arc::new(Mutex::new(VecDeque::new()));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Self { queue, waker, notifier, kv_store, logger }
 Self { queue, waker, kv_store, logger }
	}

	pub(crate) fn add_event(&self, event: Event) -> Result<(), Error> {
Expand All@@ -310,8 +308,6 @@ where
 self.persist_queue(&locked_queue)?;
 }

 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
 }
Expand All@@ -327,19 +323,12 @@ where
 EventFuture { event_queue: Arc::clone(&self.queue), waker: Arc::clone(&self.waker) }.await
	}

	pub(crate) fn wait_next_event(&self) -> Event {
 let locked_queue =
 self.notifier.wait_while(self.queue.lock().unwrap(), |queue| queue.is_empty()).unwrap();
 locked_queue.front().unwrap().clone()
	}

	pub(crate) fn event_handled(&self) -> Result<(), Error> {
 {
 let mut locked_queue = self.queue.lock().unwrap();
 locked_queue.pop_front();
 self.persist_queue(&locked_queue)?;
 }
 self.notifier.notify_one();

 if let Some(waker) = self.waker.lock().unwrap().take() {
 waker.wake();
Expand DownExpand Up@@ -383,8 +372,7 @@ where
 let read_queue: EventQueueDeserWrapper = Readable::read(reader)?;
 let queue = Arc::new(Mutex::new(read_queue.0));
 let waker = Arc::new(Mutex::new(None));
 let notifier = Condvar::new();
 Ok(Self { queue, waker, notifier, kv_store, logger })
 Ok(Self { queue, waker, kv_store, logger })
	}
}

Expand DownExpand Up@@ -1637,7 +1625,6 @@ mod tests {

 // Check we get the expected event and that it is returned until we mark it handled.
 for _ in 0..5 {
 assert_eq!(event_queue.wait_next_event(), expected_event);
Comment thread
joostjager marked this conversation as resolved.

 assert_eq!(event_queue.next_event_async().await, expected_event);
 assert_eq!(event_queue.next_event(), Some(expected_event.clone()));
 }
Expand All@@ -1652,7 +1639,7 @@ mod tests {
 .unwrap();
 let deser_event_queue =
 EventQueue::read(&mut &persisted_bytes[..], (Arc::clone(&store), logger)).unwrap();
 assert_eq!(deser_event_queue.wait_next_event(), expected_event);
 assert_eq!(deser_event_queue.next_event_async().await, expected_event);

 event_queue.event_handled().unwrap();
 assert_eq!(event_queue.next_event(), None);
Expand DownExpand Up@@ -1721,32 +1708,5 @@ mod tests {
 }
 }
 assert_eq!(event_queue.next_event(), None);

 // Check we operate correctly, even when mixing and matching blocking and async API calls.
 let (tx, mut rx) = tokio::sync::watch::channel(());
 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 let e = thread_queue.wait_next_event();
 assert_eq!(e, thread_event);
 thread_queue.event_handled().unwrap();
 tx.send(()).unwrap();
 });

 let thread_queue = Arc::clone(&event_queue);
 let thread_event = expected_event.clone();
 std::thread::spawn(move || {
 // Sleep a bit before we enqueue the events everybody is waiting for.
 std::thread::sleep(Duration::from_millis(20));
 thread_queue.add_event(thread_event.clone()).unwrap();
 thread_queue.add_event(thread_event.clone()).unwrap();
 });

 let e = event_queue.next_event_async().await;
 assert_eq!(e, expected_event.clone());
Comment thread
joostjager marked this conversation as resolved.

 event_queue.event_handled().unwrap();

 rx.changed().await.unwrap();
 assert_eq!(event_queue.next_event(), None);
	}
}
Loading
Loading