fix(cli/fs): adjust local GC root key and set workspace crate versions

Author: redsolver

Cargo.toml

@@ -33,17 +33,18 @@ log = "0.4.28"
 minicbor = { version = "2.1.1", features = ["alloc", "derive", "half"] }
 postcard = "1.1.3"
 redb = "3.1.0"
-s5_blobs = { path = "s5_blobs" }
-s5_core = { path = "s5_core" }
-s5_fs = { path = "s5_fs" }
-s5_importer_http = { path = "importers/http" }
-s5_importer_local = { path = "importers/local" }
-s5_node = { path = "s5_node" }
-s5_registry = { path = "s5_registry" }
-s5_store_local = { path = "blob_stores/local" }
-s5_store_memory = { path = "blob_stores/memory" }
-s5_store_s3 = { path = "blob_stores/s3" }
-s5_store_sia = { path = "blob_stores/sia" }
+s5_blobs = { path = "s5_blobs", version = "1.0.0-beta.1" }
+s5_core = { path = "s5_core", version = "1.0.0-beta.1" }
+s5_fs = { path = "s5_fs", version = "1.0.0-beta.1" }
+s5_fuse = { path = "s5_fuse", version = "1.0.0-beta.1" }
+s5_importer_http = { path = "importers/http", version = "1.0.0-beta.1" }
+s5_importer_local = { path = "importers/local", version = "1.0.0-beta.1" }
+s5_node = { path = "s5_node", version = "1.0.0-beta.1" }
+s5_registry = { path = "s5_registry", version = "1.0.0-beta.1" }
+s5_store_local = { path = "blob_stores/local", version = "1.0.0-beta.1" }
+s5_store_memory = { path = "blob_stores/memory", version = "1.0.0-beta.1" }
+s5_store_s3 = { path = "blob_stores/s3", version = "1.0.0-beta.1" }
+s5_store_sia = { path = "blob_stores/sia", version = "1.0.0-beta.1" }
 serde = { version = "1.0.228", features = ["derive"] }
 thiserror = "2.0.17"
 tokio = { version = "1.48.0", features = ["full"] }

s5_cli/Cargo.toml

@@ -34,7 +34,7 @@ iroh.workspace = true
 s5_blobs.workspace = true
 base64 = "0.22"
 hex = "0.4.3"
-s5_fuse = { path = "../s5_fuse" }
+s5_fuse.workspace = true
 s5_store_local.workspace = true
 url = "2.5"
 

s5_cli/src/cmd/blobs.rs

@@ -72,7 +72,7 @@ pub async fn run_blobs(
 
             // Collect all content hashes reachable from this node's
             // primary FS5 root (current head + snapshots).
-            let root_key = config.keys.get(&0x0e);
+            let root_key = None;
             let reachable = s5_fs::gc::collect_fs_reachable_hashes(fs_root, root_key).await?;
 
             let report = s5_fs::gc::gc_store(&blob_store, &reachable, &pinner, dry_run).await?;
@@ -103,7 +103,7 @@ pub async fn run_blobs(
 
             // Collect all content hashes reachable from this node's
             // primary FS5 root (current head + snapshots).
-            let root_key = config.keys.get(&0x0e);
+            let root_key = None;
             let reachable = s5_fs::gc::collect_fs_reachable_hashes(fs_root, root_key).await?;
 
             let mut missing = Vec::new();

s5_fs/src/actor/persistence.rs

@@ -193,15 +193,13 @@ impl DirActor {
             } => {
                 let hash = self.context.meta_blob_store.import_bytes(bytes).await?;
 
-                if notify_parent {
-                    if let Some(handle) = handle.upgrade() {
-                        handle
-                            .send_msg(super::ActorMessage::UpdateDirRefHash {
-                                path: path.clone(),
-                                hash: hash.hash,
-                            })
-                            .await?;
-                    }
+                if notify_parent && let Some(handle) = handle.upgrade() {
+                    handle
+                        .send_msg(super::ActorMessage::UpdateDirRefHash {
+                            path: path.clone(),
+                            hash: hash.hash,
+                        })
+                        .await?;
                 }
 
                 initial_hash.copy_from_slice(hash.hash.as_bytes());