nix-utils: replace is_valid_path with nix-bindings-store C API

Author: amaanq

subprojects/crates/nix-utils/include/nix.h

@@ -25,7 +25,6 @@ rust::String get_build_dir();
 rust::String get_log_dir();
 rust::String get_state_dir();
 
-bool is_valid_path(const StoreWrapper &wrapper, rust::Str path);
 InternalPathInfo query_path_info(const StoreWrapper &wrapper, rust::Str path);
 void clear_path_info_cache(const StoreWrapper &wrapper);
 uint64_t compute_closure_size(const StoreWrapper &wrapper, rust::Str path);

subprojects/crates/nix-utils/src/lib.rs

@@ -136,7 +136,6 @@ mod ffi {
         fn get_log_dir() -> String;
         fn get_state_dir() -> String;
 
-        fn is_valid_path(store: &StoreWrapper, path: &str) -> Result<bool>;
         fn query_path_info(store: &StoreWrapper, path: &str) -> Result<InternalPathInfo>;
         fn compute_closure_size(store: &StoreWrapper, path: &str) -> Result<u64>;
         fn clear_path_info_cache(store: &StoreWrapper) -> Result<()>;
@@ -551,11 +550,14 @@ where
 impl BaseStore for BaseStoreImpl {
     #[inline]
     async fn is_valid_path(&self, path: &StorePath) -> bool {
-        let store = self.wrapper.clone();
         let path = self.print_store_path(path);
-        asyncify(move || ffi::is_valid_path(store.as_raw(), &path))
-            .await
-            .unwrap_or(false)
+        asyncify_anyhow(move || -> Result<bool, Error> {
+            let mut nbs = open_nbs_store()?;
+            let nbs_path = nbs.parse_store_path(&path).map_err(Error::Anyhow)?;
+            Ok(nbs.is_valid_path(&nbs_path))
+        })
+        .await
+        .unwrap_or(false)
     }
 
     #[inline]

subprojects/crates/nix-utils/src/nix.cpp

@@ -65,11 +65,6 @@ rust::String get_build_dir() {
 rust::String get_log_dir() { return nix::settings.getLogFileSettings().nixLogDir.string(); }
 rust::String get_state_dir() { return nix::settings.nixStateDir.string(); }
 
-bool is_valid_path(const StoreWrapper &wrapper, rust::Str path) {
-  auto store = wrapper._store;
-  return store->isValidPath(store->parseStorePath(AS_VIEW(path)));
-}
-
 InternalPathInfo query_path_info(const StoreWrapper &wrapper, rust::Str path) {
   auto store = wrapper._store;
   auto info = store->queryPathInfo(store->parseStorePath(AS_VIEW(path)));