Skip to content

Bump LDK to 2.0.0-rc1#691

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
joostjager merged 1 commit into from
Oct 31, 2025
Merged

Bump LDK to 2.0.0-rc1 #691

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 12 additions & 12 deletions Cargo.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,17 +29,17 @@ panic = 'abort' # Abort on panic
default = []

[dependencies]
lightning = { version = "0.2.0-beta1", features = ["std"] }
lightning-types = { version = "0.3.0-beta1" }
lightning-invoice = { version = "0.34.0-beta1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-beta1" }
lightning-persister = { version = "0.2.0-beta1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-beta1" }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1" }
lightning-block-sync = { version = "0.2.0-beta1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-beta1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-beta1", features = ["std"] }
lightning-macros = { version = "0.2.0-beta1" }
lightning = { version = "0.2.0-rc1", features = ["std"] }
lightning-types = { version = "0.3.0-rc1" }
lightning-invoice = { version = "0.34.0-rc1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-rc1" }
lightning-persister = { version = "0.2.0-rc1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-rc1" }
lightning-rapid-gossip-sync = { version = "0.2.0-rc1" }
lightning-block-sync = { version = "0.2.0-rc1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
lightning-macros = { version = "0.2.0-rc1" }

#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
Expand DownExpand Up@@ -108,7 +108,7 @@ prost = { version = "0.11.6", default-features = false}
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
Expand Down
1 change: 1 addition & 0 deletions src/data_store.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ where
&self.primary_namespace,
&self.secondary_namespace,
&store_key,
false,
)
.map_err(|e| {
log_error!(
Expand Down
4 changes: 2 additions & 2 deletions src/io/sqlite_store/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ impl KVStore for SqliteStore {
}

fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand DownExpand Up@@ -205,7 +205,7 @@ impl KVStoreSync for SqliteStore {
}

fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
) -> io::Result<()> {
let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down
4 changes: 2 additions & 2 deletions src/io/test_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
let read_data = kv_store.read(primary_namespace, secondary_namespace, key).unwrap();
assert_eq!(data, &*read_data);

kv_store.remove(primary_namespace, secondary_namespace, key).unwrap();
kv_store.remove(primary_namespace, secondary_namespace, key, false).unwrap();

let listed_keys = kv_store.list(primary_namespace, secondary_namespace).unwrap();
assert_eq!(listed_keys.len(), 0);
Expand All@@ -84,7 +84,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
let read_data = kv_store.read(&max_chars, &max_chars, &max_chars).unwrap();
assert_eq!(data, &*read_data);

kv_store.remove(&max_chars, &max_chars, &max_chars).unwrap();
kv_store.remove(&max_chars, &max_chars, &max_chars, false).unwrap();

let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
assert_eq!(listed_keys.len(), 0);
Expand Down
4 changes: 2 additions & 2 deletions src/io/vss_store.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ impl KVStoreSync for VssStore {
}

fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
) -> io::Result<()> {
let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
debug_assert!(false, "Failed to access internal runtime");
Expand DownExpand Up@@ -275,7 +275,7 @@ impl KVStore for VssStore {
})
}
fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down
30 changes: 20 additions & 10 deletions tests/common/mod.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1244,14 +1244,14 @@ impl KVStore for TestSyncStore {
})
}
fn remove(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
let primary_namespace = primary_namespace.to_string();
let secondary_namespace = secondary_namespace.to_string();
let key = key.to_string();
let inner = Arc::clone(&self.inner);
let fut = tokio::task::spawn_blocking(move || {
inner.remove_internal(&primary_namespace, &secondary_namespace, &key)
inner.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy)
});
Box::pin(async move {
fut.await.unwrap_or_else(|e| {
Expand DownExpand Up@@ -1292,9 +1292,9 @@ impl KVStoreSync for TestSyncStore {
}

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

fn list(
Expand DownExpand Up@@ -1432,15 +1432,25 @@ impl TestSyncStoreInner {
}

fn remove_internal(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
) -> lightning::io::Result<()> {
let _guard = self.serializer.write().unwrap();
let fs_res =
KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key);
let sqlite_res =
KVStoreSync::remove(&self.sqlite_store, primary_namespace, secondary_namespace, key);
let test_res =
KVStoreSync::remove(&self.test_store, primary_namespace, secondary_namespace, key);
KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key, lazy);
let sqlite_res = KVStoreSync::remove(
&self.sqlite_store,
primary_namespace,
secondary_namespace,
key,
lazy,
);
let test_res = KVStoreSync::remove(
&self.test_store,
primary_namespace,
secondary_namespace,
key,
lazy,
);

assert!(!self
.do_list(primary_namespace, secondary_namespace)
Expand Down
, '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" + '
Bump LDK to 2.0.0-rc1 by tnull · Pull Request #691 · lightningdevkit/ldk-node · GitHub
Skip to content
Bump LDK to 2.0.0-rc1#691

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

joostjager
merged 1 commit into

from

Oct 31, 2025
 Merged


Bump LDK to 2.0.0-rc1
#691
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


24 changes: 12 additions & 12 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,17 +29,17 @@ panic = 'abort' # Abort on panic
default = []

[dependencies]
lightning = { version = "0.2.0-beta1", features = ["std"] }
lightning-types = { version = "0.3.0-beta1" }
lightning-invoice = { version = "0.34.0-beta1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-beta1" }
lightning-persister = { version = "0.2.0-beta1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-beta1" }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1" }
lightning-block-sync = { version = "0.2.0-beta1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-beta1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-beta1", features = ["std"] }
lightning-macros = { version = "0.2.0-beta1" }
lightning = { version = "0.2.0-rc1", features = ["std"] }
lightning-types = { version = "0.3.0-rc1" }
lightning-invoice = { version = "0.34.0-rc1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-rc1" }
lightning-persister = { version = "0.2.0-rc1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-rc1" }
lightning-rapid-gossip-sync = { version = "0.2.0-rc1" }
lightning-block-sync = { version = "0.2.0-rc1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
lightning-macros = { version = "0.2.0-rc1" }

#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
Expand DownExpand Up@@ -108,7 +108,7 @@ prost = { version = "0.11.6", default-features = false}
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
Expand Down

1 change: 1 addition & 0 deletions
src/data_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ where
 &self.primary_namespace,
 &self.secondary_namespace,
 &store_key,
 false,
 )
 .map_err(|e| {
 log_error!(
Expand Down

4 changes: 2 additions & 2 deletions
src/io/sqlite_store/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ impl KVStore for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand DownExpand Up@@ -205,7 +205,7 @@ impl KVStoreSync for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

4 changes: 2 additions & 2 deletions
src/io/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(primary_namespace, secondary_namespace, key).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(primary_namespace, secondary_namespace, key).unwrap();
	kv_store.remove(primary_namespace, secondary_namespace, key, false).unwrap();

	let listed_keys = kv_store.list(primary_namespace, secondary_namespace).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand All@@ -84,7 +84,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(&max_chars, &max_chars, &max_chars).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(&max_chars, &max_chars, &max_chars).unwrap();
	kv_store.remove(&max_chars, &max_chars, &max_chars, false).unwrap();

	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand Down

4 changes: 2 additions & 2 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ impl KVStoreSync for VssStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
 debug_assert!(false, "Failed to access internal runtime");
Expand DownExpand Up@@ -275,7 +275,7 @@ impl KVStore for VssStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

30 changes: 20 additions & 10 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1244,14 +1244,14 @@ impl KVStore for TestSyncStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let primary_namespace = primary_namespace.to_string();
 let secondary_namespace = secondary_namespace.to_string();
 let key = key.to_string();
 let inner = Arc::clone(&self.inner);
 let fut = tokio::task::spawn_blocking(move || {
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key)
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy)
 });
 Box::pin(async move {
 fut.await.unwrap_or_else(|e| {
Expand DownExpand Up@@ -1292,9 +1292,9 @@ impl KVStoreSync for TestSyncStore {
	}

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

	fn list(
Expand DownExpand Up@@ -1432,15 +1432,25 @@ impl TestSyncStoreInner {
	}

	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> lightning::io::Result<()> {
 let _guard = self.serializer.write().unwrap();
 let fs_res =
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key);
 let sqlite_res =
 KVStoreSync::remove(&self.sqlite_store, primary_namespace, secondary_namespace, key);
 let test_res =
 KVStoreSync::remove(&self.test_store, primary_namespace, secondary_namespace, key);
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key, lazy);
 let sqlite_res = KVStoreSync::remove(
 &self.sqlite_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );
 let test_res = KVStoreSync::remove(
 &self.test_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );

 assert!(!self
 .do_list(primary_namespace, secondary_namespace)
Expand Down

, '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('^' + ".*" + '
Bump LDK to 2.0.0-rc1 by tnull · Pull Request #691 · lightningdevkit/ldk-node · GitHub
Skip to content
Bump LDK to 2.0.0-rc1#691

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

joostjager
merged 1 commit into

from

Oct 31, 2025
 Merged


Bump LDK to 2.0.0-rc1
#691
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


24 changes: 12 additions & 12 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,17 +29,17 @@ panic = 'abort' # Abort on panic
default = []

[dependencies]
lightning = { version = "0.2.0-beta1", features = ["std"] }
lightning-types = { version = "0.3.0-beta1" }
lightning-invoice = { version = "0.34.0-beta1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-beta1" }
lightning-persister = { version = "0.2.0-beta1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-beta1" }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1" }
lightning-block-sync = { version = "0.2.0-beta1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-beta1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-beta1", features = ["std"] }
lightning-macros = { version = "0.2.0-beta1" }
lightning = { version = "0.2.0-rc1", features = ["std"] }
lightning-types = { version = "0.3.0-rc1" }
lightning-invoice = { version = "0.34.0-rc1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-rc1" }
lightning-persister = { version = "0.2.0-rc1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-rc1" }
lightning-rapid-gossip-sync = { version = "0.2.0-rc1" }
lightning-block-sync = { version = "0.2.0-rc1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
lightning-macros = { version = "0.2.0-rc1" }

#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
Expand DownExpand Up@@ -108,7 +108,7 @@ prost = { version = "0.11.6", default-features = false}
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
Expand Down

1 change: 1 addition & 0 deletions
src/data_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ where
 &self.primary_namespace,
 &self.secondary_namespace,
 &store_key,
 false,
 )
 .map_err(|e| {
 log_error!(
Expand Down

4 changes: 2 additions & 2 deletions
src/io/sqlite_store/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ impl KVStore for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand DownExpand Up@@ -205,7 +205,7 @@ impl KVStoreSync for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

4 changes: 2 additions & 2 deletions
src/io/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(primary_namespace, secondary_namespace, key).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(primary_namespace, secondary_namespace, key).unwrap();
	kv_store.remove(primary_namespace, secondary_namespace, key, false).unwrap();

	let listed_keys = kv_store.list(primary_namespace, secondary_namespace).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand All@@ -84,7 +84,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(&max_chars, &max_chars, &max_chars).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(&max_chars, &max_chars, &max_chars).unwrap();
	kv_store.remove(&max_chars, &max_chars, &max_chars, false).unwrap();

	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand Down

4 changes: 2 additions & 2 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ impl KVStoreSync for VssStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
 debug_assert!(false, "Failed to access internal runtime");
Expand DownExpand Up@@ -275,7 +275,7 @@ impl KVStore for VssStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

30 changes: 20 additions & 10 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1244,14 +1244,14 @@ impl KVStore for TestSyncStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let primary_namespace = primary_namespace.to_string();
 let secondary_namespace = secondary_namespace.to_string();
 let key = key.to_string();
 let inner = Arc::clone(&self.inner);
 let fut = tokio::task::spawn_blocking(move || {
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key)
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy)
 });
 Box::pin(async move {
 fut.await.unwrap_or_else(|e| {
Expand DownExpand Up@@ -1292,9 +1292,9 @@ impl KVStoreSync for TestSyncStore {
	}

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

	fn list(
Expand DownExpand Up@@ -1432,15 +1432,25 @@ impl TestSyncStoreInner {
	}

	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> lightning::io::Result<()> {
 let _guard = self.serializer.write().unwrap();
 let fs_res =
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key);
 let sqlite_res =
 KVStoreSync::remove(&self.sqlite_store, primary_namespace, secondary_namespace, key);
 let test_res =
 KVStoreSync::remove(&self.test_store, primary_namespace, secondary_namespace, key);
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key, lazy);
 let sqlite_res = KVStoreSync::remove(
 &self.sqlite_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );
 let test_res = KVStoreSync::remove(
 &self.test_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );

 assert!(!self
 .do_list(primary_namespace, secondary_namespace)
Expand Down

, '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('^' + ".*" + '
Bump LDK to 2.0.0-rc1 by tnull · Pull Request #691 · lightningdevkit/ldk-node · GitHub
Skip to content
Bump LDK to 2.0.0-rc1#691

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

joostjager
merged 1 commit into

from

Oct 31, 2025
 Merged


Bump LDK to 2.0.0-rc1
#691
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


24 changes: 12 additions & 12 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,17 +29,17 @@ panic = 'abort' # Abort on panic
default = []

[dependencies]
lightning = { version = "0.2.0-beta1", features = ["std"] }
lightning-types = { version = "0.3.0-beta1" }
lightning-invoice = { version = "0.34.0-beta1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-beta1" }
lightning-persister = { version = "0.2.0-beta1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-beta1" }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1" }
lightning-block-sync = { version = "0.2.0-beta1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-beta1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-beta1", features = ["std"] }
lightning-macros = { version = "0.2.0-beta1" }
lightning = { version = "0.2.0-rc1", features = ["std"] }
lightning-types = { version = "0.3.0-rc1" }
lightning-invoice = { version = "0.34.0-rc1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-rc1" }
lightning-persister = { version = "0.2.0-rc1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-rc1" }
lightning-rapid-gossip-sync = { version = "0.2.0-rc1" }
lightning-block-sync = { version = "0.2.0-rc1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
lightning-macros = { version = "0.2.0-rc1" }

#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
Expand DownExpand Up@@ -108,7 +108,7 @@ prost = { version = "0.11.6", default-features = false}
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
Expand Down

1 change: 1 addition & 0 deletions
src/data_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ where
 &self.primary_namespace,
 &self.secondary_namespace,
 &store_key,
 false,
 )
 .map_err(|e| {
 log_error!(
Expand Down

4 changes: 2 additions & 2 deletions
src/io/sqlite_store/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ impl KVStore for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand DownExpand Up@@ -205,7 +205,7 @@ impl KVStoreSync for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

4 changes: 2 additions & 2 deletions
src/io/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(primary_namespace, secondary_namespace, key).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(primary_namespace, secondary_namespace, key).unwrap();
	kv_store.remove(primary_namespace, secondary_namespace, key, false).unwrap();

	let listed_keys = kv_store.list(primary_namespace, secondary_namespace).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand All@@ -84,7 +84,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(&max_chars, &max_chars, &max_chars).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(&max_chars, &max_chars, &max_chars).unwrap();
	kv_store.remove(&max_chars, &max_chars, &max_chars, false).unwrap();

	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand Down

4 changes: 2 additions & 2 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ impl KVStoreSync for VssStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
 debug_assert!(false, "Failed to access internal runtime");
Expand DownExpand Up@@ -275,7 +275,7 @@ impl KVStore for VssStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

30 changes: 20 additions & 10 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1244,14 +1244,14 @@ impl KVStore for TestSyncStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let primary_namespace = primary_namespace.to_string();
 let secondary_namespace = secondary_namespace.to_string();
 let key = key.to_string();
 let inner = Arc::clone(&self.inner);
 let fut = tokio::task::spawn_blocking(move || {
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key)
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy)
 });
 Box::pin(async move {
 fut.await.unwrap_or_else(|e| {
Expand DownExpand Up@@ -1292,9 +1292,9 @@ impl KVStoreSync for TestSyncStore {
	}

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

	fn list(
Expand DownExpand Up@@ -1432,15 +1432,25 @@ impl TestSyncStoreInner {
	}

	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> lightning::io::Result<()> {
 let _guard = self.serializer.write().unwrap();
 let fs_res =
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key);
 let sqlite_res =
 KVStoreSync::remove(&self.sqlite_store, primary_namespace, secondary_namespace, key);
 let test_res =
 KVStoreSync::remove(&self.test_store, primary_namespace, secondary_namespace, key);
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key, lazy);
 let sqlite_res = KVStoreSync::remove(
 &self.sqlite_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );
 let test_res = KVStoreSync::remove(
 &self.test_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );

 assert!(!self
 .do_list(primary_namespace, secondary_namespace)
Expand Down

, '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" + '
Bump LDK to 2.0.0-rc1 by tnull · Pull Request #691 · lightningdevkit/ldk-node · GitHub
Skip to content
Bump LDK to 2.0.0-rc1#691

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

joostjager
merged 1 commit into

from

Oct 31, 2025
 Merged


Bump LDK to 2.0.0-rc1
#691
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


24 changes: 12 additions & 12 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,17 +29,17 @@ panic = 'abort' # Abort on panic
default = []

[dependencies]
lightning = { version = "0.2.0-beta1", features = ["std"] }
lightning-types = { version = "0.3.0-beta1" }
lightning-invoice = { version = "0.34.0-beta1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-beta1" }
lightning-persister = { version = "0.2.0-beta1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-beta1" }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1" }
lightning-block-sync = { version = "0.2.0-beta1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-beta1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-beta1", features = ["std"] }
lightning-macros = { version = "0.2.0-beta1" }
lightning = { version = "0.2.0-rc1", features = ["std"] }
lightning-types = { version = "0.3.0-rc1" }
lightning-invoice = { version = "0.34.0-rc1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-rc1" }
lightning-persister = { version = "0.2.0-rc1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-rc1" }
lightning-rapid-gossip-sync = { version = "0.2.0-rc1" }
lightning-block-sync = { version = "0.2.0-rc1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
lightning-macros = { version = "0.2.0-rc1" }

#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
Expand DownExpand Up@@ -108,7 +108,7 @@ prost = { version = "0.11.6", default-features = false}
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
Expand Down

1 change: 1 addition & 0 deletions
src/data_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ where
 &self.primary_namespace,
 &self.secondary_namespace,
 &store_key,
 false,
 )
 .map_err(|e| {
 log_error!(
Expand Down

4 changes: 2 additions & 2 deletions
src/io/sqlite_store/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ impl KVStore for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand DownExpand Up@@ -205,7 +205,7 @@ impl KVStoreSync for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

4 changes: 2 additions & 2 deletions
src/io/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(primary_namespace, secondary_namespace, key).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(primary_namespace, secondary_namespace, key).unwrap();
	kv_store.remove(primary_namespace, secondary_namespace, key, false).unwrap();

	let listed_keys = kv_store.list(primary_namespace, secondary_namespace).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand All@@ -84,7 +84,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(&max_chars, &max_chars, &max_chars).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(&max_chars, &max_chars, &max_chars).unwrap();
	kv_store.remove(&max_chars, &max_chars, &max_chars, false).unwrap();

	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand Down

4 changes: 2 additions & 2 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ impl KVStoreSync for VssStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
 debug_assert!(false, "Failed to access internal runtime");
Expand DownExpand Up@@ -275,7 +275,7 @@ impl KVStore for VssStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

30 changes: 20 additions & 10 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1244,14 +1244,14 @@ impl KVStore for TestSyncStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let primary_namespace = primary_namespace.to_string();
 let secondary_namespace = secondary_namespace.to_string();
 let key = key.to_string();
 let inner = Arc::clone(&self.inner);
 let fut = tokio::task::spawn_blocking(move || {
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key)
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy)
 });
 Box::pin(async move {
 fut.await.unwrap_or_else(|e| {
Expand DownExpand Up@@ -1292,9 +1292,9 @@ impl KVStoreSync for TestSyncStore {
	}

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

	fn list(
Expand DownExpand Up@@ -1432,15 +1432,25 @@ impl TestSyncStoreInner {
	}

	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> lightning::io::Result<()> {
 let _guard = self.serializer.write().unwrap();
 let fs_res =
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key);
 let sqlite_res =
 KVStoreSync::remove(&self.sqlite_store, primary_namespace, secondary_namespace, key);
 let test_res =
 KVStoreSync::remove(&self.test_store, primary_namespace, secondary_namespace, key);
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key, lazy);
 let sqlite_res = KVStoreSync::remove(
 &self.sqlite_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );
 let test_res = KVStoreSync::remove(
 &self.test_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );

 assert!(!self
 .do_list(primary_namespace, secondary_namespace)
Expand Down

, '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('^' + ".*" + '
Bump LDK to 2.0.0-rc1 by tnull · Pull Request #691 · lightningdevkit/ldk-node · GitHub
Skip to content
Bump LDK to 2.0.0-rc1#691

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

joostjager
merged 1 commit into

from

Oct 31, 2025
 Merged


Bump LDK to 2.0.0-rc1
#691
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


24 changes: 12 additions & 12 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,17 +29,17 @@ panic = 'abort' # Abort on panic
default = []

[dependencies]
lightning = { version = "0.2.0-beta1", features = ["std"] }
lightning-types = { version = "0.3.0-beta1" }
lightning-invoice = { version = "0.34.0-beta1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-beta1" }
lightning-persister = { version = "0.2.0-beta1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-beta1" }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1" }
lightning-block-sync = { version = "0.2.0-beta1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-beta1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-beta1", features = ["std"] }
lightning-macros = { version = "0.2.0-beta1" }
lightning = { version = "0.2.0-rc1", features = ["std"] }
lightning-types = { version = "0.3.0-rc1" }
lightning-invoice = { version = "0.34.0-rc1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-rc1" }
lightning-persister = { version = "0.2.0-rc1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-rc1" }
lightning-rapid-gossip-sync = { version = "0.2.0-rc1" }
lightning-block-sync = { version = "0.2.0-rc1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
lightning-macros = { version = "0.2.0-rc1" }

#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
Expand DownExpand Up@@ -108,7 +108,7 @@ prost = { version = "0.11.6", default-features = false}
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
Expand Down

1 change: 1 addition & 0 deletions
src/data_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ where
 &self.primary_namespace,
 &self.secondary_namespace,
 &store_key,
 false,
 )
 .map_err(|e| {
 log_error!(
Expand Down

4 changes: 2 additions & 2 deletions
src/io/sqlite_store/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ impl KVStore for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand DownExpand Up@@ -205,7 +205,7 @@ impl KVStoreSync for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

4 changes: 2 additions & 2 deletions
src/io/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(primary_namespace, secondary_namespace, key).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(primary_namespace, secondary_namespace, key).unwrap();
	kv_store.remove(primary_namespace, secondary_namespace, key, false).unwrap();

	let listed_keys = kv_store.list(primary_namespace, secondary_namespace).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand All@@ -84,7 +84,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(&max_chars, &max_chars, &max_chars).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(&max_chars, &max_chars, &max_chars).unwrap();
	kv_store.remove(&max_chars, &max_chars, &max_chars, false).unwrap();

	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand Down

4 changes: 2 additions & 2 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ impl KVStoreSync for VssStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
 debug_assert!(false, "Failed to access internal runtime");
Expand DownExpand Up@@ -275,7 +275,7 @@ impl KVStore for VssStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

30 changes: 20 additions & 10 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1244,14 +1244,14 @@ impl KVStore for TestSyncStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let primary_namespace = primary_namespace.to_string();
 let secondary_namespace = secondary_namespace.to_string();
 let key = key.to_string();
 let inner = Arc::clone(&self.inner);
 let fut = tokio::task::spawn_blocking(move || {
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key)
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy)
 });
 Box::pin(async move {
 fut.await.unwrap_or_else(|e| {
Expand DownExpand Up@@ -1292,9 +1292,9 @@ impl KVStoreSync for TestSyncStore {
	}

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

	fn list(
Expand DownExpand Up@@ -1432,15 +1432,25 @@ impl TestSyncStoreInner {
	}

	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> lightning::io::Result<()> {
 let _guard = self.serializer.write().unwrap();
 let fs_res =
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key);
 let sqlite_res =
 KVStoreSync::remove(&self.sqlite_store, primary_namespace, secondary_namespace, key);
 let test_res =
 KVStoreSync::remove(&self.test_store, primary_namespace, secondary_namespace, key);
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key, lazy);
 let sqlite_res = KVStoreSync::remove(
 &self.sqlite_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );
 let test_res = KVStoreSync::remove(
 &self.test_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );

 assert!(!self
 .do_list(primary_namespace, secondary_namespace)
Expand Down

, '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); }
})();
})();
Bump LDK to 2.0.0-rc1 by tnull · Pull Request #691 · lightningdevkit/ldk-node · GitHub
Skip to content
Bump LDK to 2.0.0-rc1#691

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

joostjager
merged 1 commit into

from

Oct 31, 2025
 Merged


Bump LDK to 2.0.0-rc1
#691
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


24 changes: 12 additions & 12 deletions
Cargo.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,17 +29,17 @@ panic = 'abort' # Abort on panic
default = []

[dependencies]
lightning = { version = "0.2.0-beta1", features = ["std"] }
lightning-types = { version = "0.3.0-beta1" }
lightning-invoice = { version = "0.34.0-beta1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-beta1" }
lightning-persister = { version = "0.2.0-beta1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-beta1" }
lightning-rapid-gossip-sync = { version = "0.2.0-beta1" }
lightning-block-sync = { version = "0.2.0-beta1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-beta1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-beta1", features = ["std"] }
lightning-macros = { version = "0.2.0-beta1" }
lightning = { version = "0.2.0-rc1", features = ["std"] }
lightning-types = { version = "0.3.0-rc1" }
lightning-invoice = { version = "0.34.0-rc1", features = ["std"] }
lightning-net-tokio = { version = "0.2.0-rc1" }
lightning-persister = { version = "0.2.0-rc1", features = ["tokio"] }
lightning-background-processor = { version = "0.2.0-rc1" }
lightning-rapid-gossip-sync = { version = "0.2.0-rc1" }
lightning-block-sync = { version = "0.2.0-rc1", features = ["rest-client", "rpc-client", "tokio"] }
lightning-transaction-sync = { version = "0.2.0-rc1", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
lightning-liquidity = { version = "0.2.0-rc1", features = ["std"] }
lightning-macros = { version = "0.2.0-rc1" }

#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main", features = ["std"] }
#lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", branch = "main" }
Expand DownExpand Up@@ -108,7 +108,7 @@ prost = { version = "0.11.6", default-features = false}
winapi = { version = "0.3", features = ["winbase"] }

[dev-dependencies]
lightning = { version = "0.2.0-beta1", features = ["std", "_test_utils"] }
lightning = { version = "0.2.0-rc1", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
#lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "21e9a9c0ef80021d0669f2a366f55d08ba8d9b03", features = ["std", "_test_utils"] }
#lightning = { path = "../rust-lightning/lightning", features = ["std", "_test_utils"] }
Expand Down

1 change: 1 addition & 0 deletions
src/data_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -103,6 +103,7 @@ where
 &self.primary_namespace,
 &self.secondary_namespace,
 &store_key,
 false,
 )
 .map_err(|e| {
 log_error!(
Expand Down

4 changes: 2 additions & 2 deletions
src/io/sqlite_store/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -137,7 +137,7 @@ impl KVStore for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand DownExpand Up@@ -205,7 +205,7 @@ impl KVStoreSync for SqliteStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

4 changes: 2 additions & 2 deletions
src/io/test_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -68,7 +68,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(primary_namespace, secondary_namespace, key).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(primary_namespace, secondary_namespace, key).unwrap();
	kv_store.remove(primary_namespace, secondary_namespace, key, false).unwrap();

	let listed_keys = kv_store.list(primary_namespace, secondary_namespace).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand All@@ -84,7 +84,7 @@ pub(crate) fn do_read_write_remove_list_persist<K: KVStoreSync + RefUnwindSafe>(
	let read_data = kv_store.read(&max_chars, &max_chars, &max_chars).unwrap();
	assert_eq!(data, &*read_data);

	kv_store.remove(&max_chars, &max_chars, &max_chars).unwrap();
	kv_store.remove(&max_chars, &max_chars, &max_chars, false).unwrap();

	let listed_keys = kv_store.list(&max_chars, &max_chars).unwrap();
	assert_eq!(listed_keys.len(), 0);
Expand Down

4 changes: 2 additions & 2 deletions
src/io/vss_store.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -181,7 +181,7 @@ impl KVStoreSync for VssStore {
	}

	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> io::Result<()> {
 let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
 debug_assert!(false, "Failed to access internal runtime");
Expand DownExpand Up@@ -275,7 +275,7 @@ impl KVStore for VssStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
Expand Down

30 changes: 20 additions & 10 deletions
tests/common/mod.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1244,14 +1244,14 @@ impl KVStore for TestSyncStore {
 })
	}
	fn remove(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + Send>> {
 let primary_namespace = primary_namespace.to_string();
 let secondary_namespace = secondary_namespace.to_string();
 let key = key.to_string();
 let inner = Arc::clone(&self.inner);
 let fut = tokio::task::spawn_blocking(move || {
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key)
 inner.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy)
 });
 Box::pin(async move {
 fut.await.unwrap_or_else(|e| {
Expand DownExpand Up@@ -1292,9 +1292,9 @@ impl KVStoreSync for TestSyncStore {
	}

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

	fn list(
Expand DownExpand Up@@ -1432,15 +1432,25 @@ impl TestSyncStoreInner {
	}

	fn remove_internal(
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str,
 &self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
	) -> lightning::io::Result<()> {
 let _guard = self.serializer.write().unwrap();
 let fs_res =
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key);
 let sqlite_res =
 KVStoreSync::remove(&self.sqlite_store, primary_namespace, secondary_namespace, key);
 let test_res =
 KVStoreSync::remove(&self.test_store, primary_namespace, secondary_namespace, key);
 KVStoreSync::remove(&self.fs_store, primary_namespace, secondary_namespace, key, lazy);
 let sqlite_res = KVStoreSync::remove(
 &self.sqlite_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );
 let test_res = KVStoreSync::remove(
 &self.test_store,
 primary_namespace,
 secondary_namespace,
 key,
 lazy,
 );

 assert!(!self
 .do_list(primary_namespace, secondary_namespace)
Expand Down