Skip to content

Clean up persistence constants #4105

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Clean up persistence constants #4105

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c08ea1d
Rename namespace validity constants to be more concise
TheBlueMatt Sep 22, 2025
1660c72
Rename persistence namespace/key constants to be more concise
TheBlueMatt Sep 22, 2025
98e6a8e
Drop verbose `*_SECONDARY_NAMESPACE` consts that are always ""
TheBlueMatt Sep 22, 2025
5ffee02
Remove unnecessary variable indirection in `persist.rs`
TheBlueMatt Sep 22, 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
119 changes: 37 additions & 82 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,8 @@ use lightning::sign::{
};
use lightning::util::logger::Logger;
use lightning::util::persist::{
KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_KEY,
CHANNEL_MANAGER_PRIMARY_NAMESPACE, CHANNEL_MANAGER_SECONDARY_NAMESPACE, NETWORK_GRAPH_KEY,
NETWORK_GRAPH_PRIMARY_NAMESPACE, NETWORK_GRAPH_SECONDARY_NAMESPACE, SCORER_KEY,
SCORER_PRIMARY_NAMESPACE, SCORER_SECONDARY_NAMESPACE,
KVStore, KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_KEY, CHANNEL_MANAGER_NAMESPACE,
NETWORK_GRAPH_KEY, NETWORK_GRAPH_NAMESPACE, SCORER_KEY, SCORER_NAMESPACE,
};
use lightning::util::sweep::{OutputSweeper, OutputSweeperSync};
#[cfg(feature = "std")]
Expand Down Expand Up @@ -941,14 +939,8 @@ where
if let Some(duration_since_epoch) = fetch_time() {
if update_scorer(scorer, &event, duration_since_epoch) {
log_trace!(logger, "Persisting scorer after update");
if let Err(e) = kv_store
.write(
SCORER_PRIMARY_NAMESPACE,
SCORER_SECONDARY_NAMESPACE,
SCORER_KEY,
scorer.encode(),
)
.await
if let Err(e) =
kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode()).await
{
log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e);
// We opt not to abort early on persistence failure here as persisting
Expand Down Expand Up @@ -1079,8 +1071,8 @@ where
let fut = async {
Copy link
Contributor

@valentinewallace valentinewallace Nov 14, 2025

Choose a reason for hiding this comment

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

Here and below, we could do:

diff --git a/lightning-background-processor/src/lib.rs b/lightning-background-processor/src/lib.rs
index 7b4f29896..af851f5f6 100644
--- a/lightning-background-processor/src/lib.rs
+++ b/lightning-background-processor/src/lib.rs
@@ -1068,15 +1068,9 @@ where
                if channel_manager.get_cm().get_and_clear_needs_persistence() {
                        log_trace!(logger, "Persisting ChannelManager...");

+                       let mgr = channel_manager.get_cm().encode();
                        let fut = async {
-                               kv_store
-                                       .write(
-                                               CHANNEL_MANAGER_NAMESPACE,
-                                               "",
-                                               CHANNEL_MANAGER_KEY,
-                                               channel_manager.get_cm().encode(),
-                                       )
-                                       .await
+                               kv_store.write(CHANNEL_MANAGER_NAMESPACE, "", CHANNEL_MANAGER_KEY, mgr).await
                        };
                        // TODO: Once our MSRV is 1.68 we should be able to drop the Box
                        let mut fut = Box::pin(fut);

kv_store
.write(
CHANNEL_MANAGER_PRIMARY_NAMESPACE,
CHANNEL_MANAGER_SECONDARY_NAMESPACE,
CHANNEL_MANAGER_NAMESPACE,
"",
CHANNEL_MANAGER_KEY,
channel_manager.get_cm().encode(),
)
Expand Down Expand Up @@ -1142,8 +1134,8 @@ where
let fut = async {
if let Err(e) = kv_store
.write(
NETWORK_GRAPH_PRIMARY_NAMESPACE,
NETWORK_GRAPH_SECONDARY_NAMESPACE,
NETWORK_GRAPH_NAMESPACE,
"",
NETWORK_GRAPH_KEY,
network_graph.encode(),
)
Expand Down Expand Up @@ -1182,14 +1174,8 @@ where
log_trace!(logger, "Persisting scorer");
}
let fut = async {
if let Err(e) = kv_store
.write(
SCORER_PRIMARY_NAMESPACE,
SCORER_SECONDARY_NAMESPACE,
SCORER_KEY,
scorer.encode(),
)
.await
if let Err(e) =
kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode()).await
{
log_error!(
logger,
Expand Down Expand Up @@ -1300,30 +1286,18 @@ where
// ChannelMonitor update(s) persisted without a corresponding ChannelManager update.
kv_store
.write(
CHANNEL_MANAGER_PRIMARY_NAMESPACE,
CHANNEL_MANAGER_SECONDARY_NAMESPACE,
CHANNEL_MANAGER_NAMESPACE,
"",
CHANNEL_MANAGER_KEY,
channel_manager.get_cm().encode(),
)
.await?;
if let Some(ref scorer) = scorer {
kv_store
.write(
SCORER_PRIMARY_NAMESPACE,
SCORER_SECONDARY_NAMESPACE,
SCORER_KEY,
scorer.encode(),
)
.await?;
kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode()).await?;
}
if let Some(network_graph) = gossip_sync.network_graph() {
kv_store
.write(
NETWORK_GRAPH_PRIMARY_NAMESPACE,
NETWORK_GRAPH_SECONDARY_NAMESPACE,
NETWORK_GRAPH_KEY,
network_graph.encode(),
)
.write(NETWORK_GRAPH_NAMESPACE, "", NETWORK_GRAPH_KEY, network_graph.encode())
.await?;
}
Ok(())
Expand Down Expand Up @@ -1525,12 +1499,9 @@ impl BackgroundProcessor {
.expect("Time should be sometime after 1970");
if update_scorer(scorer, &event, duration_since_epoch) {
log_trace!(logger, "Persisting scorer after update");
if let Err(e) = kv_store.write(
SCORER_PRIMARY_NAMESPACE,
SCORER_SECONDARY_NAMESPACE,
SCORER_KEY,
scorer.encode(),
) {
if let Err(e) =
kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode())
{
log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e)
}
}
Expand Down Expand Up @@ -1626,8 +1597,8 @@ impl BackgroundProcessor {
if channel_manager.get_cm().get_and_clear_needs_persistence() {
log_trace!(logger, "Persisting ChannelManager...");
(kv_store.write(
CHANNEL_MANAGER_PRIMARY_NAMESPACE,
CHANNEL_MANAGER_SECONDARY_NAMESPACE,
CHANNEL_MANAGER_NAMESPACE,
"",
CHANNEL_MANAGER_KEY,
channel_manager.get_cm().encode(),
))?;
Expand Down Expand Up @@ -1665,8 +1636,8 @@ impl BackgroundProcessor {
duration_since_epoch.as_secs(),
);
if let Err(e) = kv_store.write(
NETWORK_GRAPH_PRIMARY_NAMESPACE,
NETWORK_GRAPH_SECONDARY_NAMESPACE,
NETWORK_GRAPH_NAMESPACE,
"",
NETWORK_GRAPH_KEY,
network_graph.encode(),
) {
Expand All @@ -1693,12 +1664,9 @@ impl BackgroundProcessor {
.expect("Time should be sometime after 1970");
log_trace!(logger, "Calling time_passed and persisting scorer");
scorer.write_lock().time_passed(duration_since_epoch);
if let Err(e) = kv_store.write(
SCORER_PRIMARY_NAMESPACE,
SCORER_SECONDARY_NAMESPACE,
SCORER_KEY,
scorer.encode(),
) {
if let Err(e) =
kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode())
{
log_error!(logger, "Error: Failed to persist scorer, check your disk and permissions {}", e);
}
}
Expand Down Expand Up @@ -1734,23 +1702,18 @@ impl BackgroundProcessor {
// some races where users quit while channel updates were in-flight, with
// ChannelMonitor update(s) persisted without a corresponding ChannelManager update.
kv_store.write(
CHANNEL_MANAGER_PRIMARY_NAMESPACE,
CHANNEL_MANAGER_SECONDARY_NAMESPACE,
CHANNEL_MANAGER_NAMESPACE,
"",
CHANNEL_MANAGER_KEY,
channel_manager.get_cm().encode(),
)?;
if let Some(ref scorer) = scorer {
kv_store.write(
SCORER_PRIMARY_NAMESPACE,
SCORER_SECONDARY_NAMESPACE,
SCORER_KEY,
scorer.encode(),
)?;
kv_store.write(SCORER_NAMESPACE, "", SCORER_KEY, scorer.encode())?;
}
if let Some(network_graph) = gossip_sync.network_graph() {
kv_store.write(
NETWORK_GRAPH_PRIMARY_NAMESPACE,
NETWORK_GRAPH_SECONDARY_NAMESPACE,
NETWORK_GRAPH_NAMESPACE,
"",
NETWORK_GRAPH_KEY,
network_graph.encode(),
)?;
Expand Down Expand Up @@ -1843,10 +1806,8 @@ mod tests {
use lightning::types::payment::PaymentHash;
use lightning::util::config::UserConfig;
use lightning::util::persist::{
KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_KEY, CHANNEL_MANAGER_PRIMARY_NAMESPACE,
CHANNEL_MANAGER_SECONDARY_NAMESPACE, NETWORK_GRAPH_KEY, NETWORK_GRAPH_PRIMARY_NAMESPACE,
NETWORK_GRAPH_SECONDARY_NAMESPACE, SCORER_KEY, SCORER_PRIMARY_NAMESPACE,
SCORER_SECONDARY_NAMESPACE,
KVStoreSync, KVStoreSyncWrapper, CHANNEL_MANAGER_KEY, CHANNEL_MANAGER_NAMESPACE,
NETWORK_GRAPH_KEY, NETWORK_GRAPH_NAMESPACE, SCORER_KEY, SCORER_NAMESPACE,
};
use lightning::util::ser::Writeable;
use lightning::util::sweep::{
Expand Down Expand Up @@ -2101,19 +2062,15 @@ mod tests {
fn write(
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
) -> lightning::io::Result<()> {
if primary_namespace == CHANNEL_MANAGER_PRIMARY_NAMESPACE
&& secondary_namespace == CHANNEL_MANAGER_SECONDARY_NAMESPACE
&& key == CHANNEL_MANAGER_KEY
{
if primary_namespace == CHANNEL_MANAGER_NAMESPACE && key == CHANNEL_MANAGER_KEY {
assert_eq!(secondary_namespace, "");
if let Some((error, message)) = self.manager_error {
return Err(std::io::Error::new(error, message).into());
}
}

if primary_namespace == NETWORK_GRAPH_PRIMARY_NAMESPACE
&& secondary_namespace == NETWORK_GRAPH_SECONDARY_NAMESPACE
&& key == NETWORK_GRAPH_KEY
{
if primary_namespace == NETWORK_GRAPH_NAMESPACE && key == NETWORK_GRAPH_KEY {
assert_eq!(secondary_namespace, "");
if let Some(sender) = &self.graph_persistence_notifier {
match sender.send(()) {
Ok(()) => {},
Expand All @@ -2128,10 +2085,8 @@ mod tests {
}
}

if primary_namespace == SCORER_PRIMARY_NAMESPACE
&& secondary_namespace == SCORER_SECONDARY_NAMESPACE
&& key == SCORER_KEY
{
if primary_namespace == SCORER_NAMESPACE && key == SCORER_KEY {
assert_eq!(secondary_namespace, "");
if let Some((error, message)) = self.scorer_error {
return Err(std::io::Error::new(error, message).into());
}
Expand Down
29 changes: 10 additions & 19 deletions lightning/src/ln/chanmon_update_fail_tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ use crate::ln::types::ChannelId;
use crate::sign::NodeSigner;
use crate::util::native_async::FutureQueue;
use crate::util::persist::{
MonitorName, MonitorUpdatingPersisterAsync, CHANNEL_MONITOR_PRIMARY_NAMESPACE,
CHANNEL_MONITOR_SECONDARY_NAMESPACE, MONITOR_UPDATE_PRIMARY_NAMESPACE,
MonitorName, MonitorUpdatingPersisterAsync, CHANNEL_MONITOR_NAMESPACE, MONITOR_UPDATE_NAMESPACE,
};
use crate::util::ser::{ReadableArgs, Writeable};
use crate::util::test_channel_signer::TestChannelSigner;
Expand Down Expand Up @@ -4938,11 +4937,7 @@ fn native_async_persist() {

let funding_txo = OutPoint { txid: funding_tx.compute_txid(), index: 0 };
let key = MonitorName::V1Channel(funding_txo).to_string();
let pending_writes = kv_store.list_pending_async_writes(
CHANNEL_MONITOR_PRIMARY_NAMESPACE,
CHANNEL_MONITOR_SECONDARY_NAMESPACE,
&key,
);
let pending_writes = kv_store.list_pending_async_writes(CHANNEL_MONITOR_NAMESPACE, "", &key);
assert_eq!(pending_writes.len(), 1);

// Once we complete the future, the write will still be pending until the future gets `poll`ed.
Expand Down Expand Up @@ -4970,21 +4965,19 @@ fn native_async_persist() {
persist_futures.poll_futures();
assert_eq!(async_chain_monitor.release_pending_monitor_events().len(), 0);

let pending_writes =
kv_store.list_pending_async_writes(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "1");
let pending_writes = kv_store.list_pending_async_writes(MONITOR_UPDATE_NAMESPACE, &key, "1");
assert_eq!(pending_writes.len(), 1);
let pending_writes =
kv_store.list_pending_async_writes(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "2");
let pending_writes = kv_store.list_pending_async_writes(MONITOR_UPDATE_NAMESPACE, &key, "2");
assert_eq!(pending_writes.len(), 1);

kv_store.complete_async_writes_through(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "1", usize::MAX);
kv_store.complete_async_writes_through(MONITOR_UPDATE_NAMESPACE, &key, "1", usize::MAX);
persist_futures.poll_futures();
// While the `ChainMonitor` could return a `MonitorEvent::Completed` here, it currently
// doesn't. If that ever changes we should validate that the `Completed` event has the correct
// `monitor_update_id` (1).
assert!(async_chain_monitor.release_pending_monitor_events().is_empty());

kv_store.complete_async_writes_through(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "2", usize::MAX);
kv_store.complete_async_writes_through(MONITOR_UPDATE_NAMESPACE, &key, "2", usize::MAX);
persist_futures.poll_futures();
let completed_persist = async_chain_monitor.release_pending_monitor_events();
assert_eq!(completed_persist.len(), 1);
Expand All @@ -5003,18 +4996,16 @@ fn native_async_persist() {
persist_futures.poll_futures();
assert_eq!(async_chain_monitor.release_pending_monitor_events().len(), 0);

let pending_writes =
kv_store.list_pending_async_writes(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "3");
let pending_writes = kv_store.list_pending_async_writes(MONITOR_UPDATE_NAMESPACE, &key, "3");
assert_eq!(pending_writes.len(), 1);
let pending_writes =
kv_store.list_pending_async_writes(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "4");
let pending_writes = kv_store.list_pending_async_writes(MONITOR_UPDATE_NAMESPACE, &key, "4");
assert_eq!(pending_writes.len(), 1);

kv_store.complete_async_writes_through(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "4", usize::MAX);
kv_store.complete_async_writes_through(MONITOR_UPDATE_NAMESPACE, &key, "4", usize::MAX);
persist_futures.poll_futures();
assert_eq!(async_chain_monitor.release_pending_monitor_events().len(), 0);

kv_store.complete_async_writes_through(MONITOR_UPDATE_PRIMARY_NAMESPACE, &key, "3", usize::MAX);
kv_store.complete_async_writes_through(MONITOR_UPDATE_NAMESPACE, &key, "3", usize::MAX);
persist_futures.poll_futures();
let completed_persist = async_chain_monitor.release_pending_monitor_events();
assert_eq!(completed_persist.len(), 1);
Expand Down
Loading