Skip to content

Commit 3564646

Browse files
TheBlueMattTheBlueMatt
authored
Merge pull request #4069 from tnull/2025-09-async-test-store
Implement `KVStore` for `TestStore`
2 parents f3c22a7 + 012bb7a commit 3564646

File tree

2 files changed

+90
-40
lines changed

2 files changed

+90
-40
lines changed

‎lightning/src/util/persist.rs‎

Lines changed: 29 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,14 +1257,13 @@ mod tests {
12571257

12581258
let monitor_name = mon.persistence_key();
12591259
assert_eq!(
1260-
persister_0
1261-
.kv_store
1262-
.list(
1263-
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1264-
&monitor_name.to_string()
1265-
)
1266-
.unwrap()
1267-
.len() as u64,
1260+
KVStoreSync::list(
1261+
&*persister_0.kv_store,
1262+
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1263+
&monitor_name.to_string()
1264+
)
1265+
.unwrap()
1266+
.len() as u64,
12681267
mon.get_latest_update_id() % persister_0_max_pending_updates,
12691268
"Wrong number of updates stored in persister 0",
12701269
);
@@ -1276,14 +1275,13 @@ mod tests {
12761275
assert_eq!(mon.get_latest_update_id(), $expected_update_id);
12771276
let monitor_name = mon.persistence_key();
12781277
assert_eq!(
1279-
persister_1
1280-
.kv_store
1281-
.list(
1282-
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1283-
&monitor_name.to_string()
1284-
)
1285-
.unwrap()
1286-
.len() as u64,
1278+
KVStoreSync::list(
1279+
&*persister_1.kv_store,
1280+
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1281+
&monitor_name.to_string()
1282+
)
1283+
.unwrap()
1284+
.len() as u64,
12871285
mon.get_latest_update_id() % persister_1_max_pending_updates,
12881286
"Wrong number of updates stored in persister 1",
12891287
);
@@ -1481,28 +1479,26 @@ mod tests {
14811479
let persisted_chan_data = persister_0.read_all_channel_monitors_with_updates().unwrap();
14821480
let (_, monitor) = &persisted_chan_data[0];
14831481
let monitor_name = monitor.persistence_key();
1484-
persister_0
1485-
.kv_store
1486-
.write(
1487-
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1488-
&monitor_name.to_string(),
1489-
UpdateName::from(1).as_str(),
1490-
vec![0u8; 1],
1491-
)
1492-
.unwrap();
1482+
KVStoreSync::write(
1483+
&*persister_0.kv_store,
1484+
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1485+
&monitor_name.to_string(),
1486+
UpdateName::from(1).as_str(),
1487+
vec![0u8; 1],
1488+
)
1489+
.unwrap();
14931490

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

14971494
// Confirm the stale update is unreadable/gone
1498-
assert!(persister_0
1499-
.kv_store
1500-
.read(
1501-
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1502-
&monitor_name.to_string(),
1503-
UpdateName::from(1).as_str()
1504-
)
1505-
.is_err());
1495+
assert!(KVStoreSync::read(
1496+
&*persister_0.kv_store,
1497+
CHANNEL_MONITOR_UPDATE_PERSISTENCE_PRIMARY_NAMESPACE,
1498+
&monitor_name.to_string(),
1499+
UpdateName::from(1).as_str()
1500+
)
1501+
.is_err());
15061502
}
15071503

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

‎lightning/src/util/test_utils.rs‎

Lines changed: 61 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ use crate::util::dyn_signer::{
5757
use crate::util::logger::{Logger, Record};
5858
#[cfg(feature = "std")]
5959
use crate::util::mut_global::MutGlobal;
60-
use crate::util::persist::{KVStoreSync, MonitorName};
60+
use crate::util::persist::{KVStore, KVStoreSync, MonitorName};
6161
use crate::util::ser::{Readable, ReadableArgs, Writeable, Writer};
6262
use crate::util::test_channel_signer::{EnforcementState, TestChannelSigner};
6363

@@ -84,7 +84,10 @@ use crate::io;
8484
use crate::prelude::*;
8585
use crate::sign::{EntropySource, NodeSigner, RandomBytes, Recipient, SignerProvider};
8686
use crate::sync::{Arc, Mutex};
87+
use alloc::boxed::Box;
88+
use core::future::Future;
8789
use core::mem;
90+
use core::pin::Pin;
8891
use core::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
8992
use core::time::Duration;
9093

@@ -863,10 +866,8 @@ impl TestStore {
863866
let persisted_bytes = Mutex::new(new_hash_map());
864867
Self { persisted_bytes, read_only }
865868
}
866-
}
867869

868-
impl KVStoreSync for TestStore {
869-
fn read(
870+
fn read_internal(
870871
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
871872
) -> io::Result<Vec<u8>> {
872873
let persisted_lock = self.persisted_bytes.lock().unwrap();
@@ -888,7 +889,7 @@ impl KVStoreSync for TestStore {
888889
}
889890
}
890891

891-
fn write(
892+
fn write_internal(
892893
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
893894
) -> io::Result<()> {
894895
if self.read_only {
@@ -911,7 +912,7 @@ impl KVStoreSync for TestStore {
911912
Ok(())
912913
}
913914

914-
fn remove(
915+
fn remove_internal(
915916
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, _lazy: bool,
916917
) -> io::Result<()> {
917918
if self.read_only {
@@ -935,7 +936,9 @@ impl KVStoreSync for TestStore {
935936
Ok(())
936937
}
937938

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

941944
let prefixed = if secondary_namespace.is_empty() {
@@ -950,6 +953,57 @@ impl KVStoreSync for TestStore {
950953
}
951954
}
952955

956+
impl KVStore for TestStore {
957+
fn read(
958+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
959+
) -> Pin<Box<dyn Future<Output = Result<Vec<u8>, io::Error>> + 'static + Send>> {
960+
let res = self.read_internal(&primary_namespace, &secondary_namespace, &key);
961+
Box::pin(async move { res })
962+
}
963+
fn write(
964+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
965+
) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
966+
let res = self.write_internal(&primary_namespace, &secondary_namespace, &key, buf);
967+
Box::pin(async move { res })
968+
}
969+
fn remove(
970+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
971+
) -> Pin<Box<dyn Future<Output = Result<(), io::Error>> + 'static + Send>> {
972+
let res = self.remove_internal(&primary_namespace, &secondary_namespace, &key, lazy);
973+
Box::pin(async move { res })
974+
}
975+
fn list(
976+
&self, primary_namespace: &str, secondary_namespace: &str,
977+
) -> Pin<Box<dyn Future<Output = Result<Vec<String>, io::Error>> + 'static + Send>> {
978+
let res = self.list_internal(primary_namespace, secondary_namespace);
979+
Box::pin(async move { res })
980+
}
981+
}
982+
983+
impl KVStoreSync for TestStore {
984+
fn read(
985+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str,
986+
) -> io::Result<Vec<u8>> {
987+
self.read_internal(primary_namespace, secondary_namespace, key)
988+
}
989+
990+
fn write(
991+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, buf: Vec<u8>,
992+
) -> io::Result<()> {
993+
self.write_internal(primary_namespace, secondary_namespace, key, buf)
994+
}
995+
996+
fn remove(
997+
&self, primary_namespace: &str, secondary_namespace: &str, key: &str, lazy: bool,
998+
) -> io::Result<()> {
999+
self.remove_internal(primary_namespace, secondary_namespace, key, lazy)
1000+
}
1001+
1002+
fn list(&self, primary_namespace: &str, secondary_namespace: &str) -> io::Result<Vec<String>> {
1003+
self.list_internal(primary_namespace, secondary_namespace)
1004+
}
1005+
}
1006+
9531007
unsafe impl Sync for TestStore {}
9541008
unsafe impl Send for TestStore {}
9551009

0 commit comments

Comments
 (0)