f Account for sub-namespaces

Author: tnull

lightning/src/util/persist.rs

@@ -199,7 +199,9 @@ where
 {
 	let mut res = Vec::new();
 
-	for stored_key in kv_store.list(CHANNEL_MONITOR_PERSISTENCE_NAMESPACE)? {
+	for stored_key in kv_store.list(
+		CHANNEL_MONITOR_PERSISTENCE_NAMESPACE, CHANNEL_MONITOR_PERSISTENCE_SUB_NAMESPACE)?
+	{
 		let txid = Txid::from_hex(stored_key.split_at(64).0).map_err(|_| {
 			io::Error::new(io::ErrorKind::InvalidData, "Invalid tx ID in stored key")
 		})?;
@@ -209,7 +211,8 @@ where
 		})?;
 
 		match <(BlockHash, ChannelMonitor<<SP::Target as SignerProvider>::Signer>)>::read(
-			&mut io::Cursor::new(kv_store.read(CHANNEL_MONITOR_PERSISTENCE_NAMESPACE, &stored_key)?),
+			&mut io::Cursor::new(
+				kv_store.read(CHANNEL_MONITOR_PERSISTENCE_NAMESPACE, CHANNEL_MONITOR_PERSISTENCE_SUB_NAMESPACE, &stored_key)?),
 			(&*entropy_source, &*signer_provider),
 		) {
 			Ok((block_hash, channel_monitor)) => {