Seanaye/persistence trait

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iroh-blobs"
-version = "0.34.1"
+version = "0.35.1"
 edition = "2021"
 readme = "README.md"
 description = "blob and collection transfer support for iroh"

src/lib.rs

@@ -38,6 +38,7 @@
 #![deny(missing_docs, rustdoc::broken_intra_doc_links)]
 #![recursion_limit = "256"]
 #![cfg_attr(iroh_docsrs, feature(doc_auto_cfg))]
+#![feature(async_closure)]
 
 #[cfg(feature = "cli")]
 pub mod cli;

src/net_protocol.rs

@@ -7,6 +7,7 @@ use std::{
     collections::BTreeSet,
     fmt::Debug,
     ops::{Deref, DerefMut},
+    path::PathBuf,
     sync::Arc,
 };
 
@@ -20,7 +21,7 @@ use tracing::debug;
 use crate::{
     downloader::{ConcurrencyLimits, Downloader, RetryConfig},
     provider::EventSender,
-    store::GcConfig,
+    store::{fs::Persistence, GcConfig},
     util::{
         local_pool::{self, LocalPool, LocalPoolHandle},
         SetTagOption,
@@ -221,12 +222,19 @@ impl Blobs<crate::store::mem::Store> {
     }
 }
 
-impl Blobs<crate::store::fs::Store> {
+impl<T> Blobs<crate::store::fs::Store<T>>
+where
+    T: Persistence,
+{
     /// Load a persistent Blobs protocol handler from a path.
     pub async fn persistent(
         path: impl AsRef<std::path::Path>,
-    ) -> anyhow::Result<Builder<crate::store::fs::Store>> {
-        Ok(Self::builder(crate::store::fs::Store::load(path).await?))
+        db_path: PathBuf,
+        backend: T,
+    ) -> anyhow::Result<Builder<crate::store::fs::Store<T>>> {
+        Ok(Self::builder(
+            crate::store::fs::Store::load_with_backend(path, db_path, backend).await?,
+        ))
     }
 }
 

src/rpc/client/blobs.rs

@@ -1028,6 +1028,7 @@ mod tests {
             net_protocol::Blobs,
             provider::{CustomEventSender, EventSender},
             rpc::client::{blobs, tags},
+            store::fs::FileSystemPersistence,
         };
 
         type RpcClient = quic_rpc::RpcClient<RpcService>;
@@ -1113,7 +1114,8 @@ mod tests {
             /// Creates a new node with persistent storage
             pub async fn persistent(
                 path: impl AsRef<Path>,
-            ) -> anyhow::Result<Builder<crate::store::fs::Store>> {
+            ) -> anyhow::Result<Builder<crate::store::fs::Store<FileSystemPersistence>>>
+            {
                 Ok(Builder {
                     store: crate::store::fs::Store::load(path).await?,
                     events: Default::default(),