Remove invalid store error

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

crates/key-value-sqlite/src/lib.rs

@@ -158,11 +158,6 @@ mod test {
             )])),
         );
 
-        assert!(matches!(
-            kv.exists(Resource::new_own(42), "bar".to_owned()).await?,
-            Err(Error::InvalidStore)
-        ));
-
         assert!(matches!(
             kv.open("foo".to_owned()).await?,
             Err(Error::NoSuchStore)
@@ -235,11 +230,6 @@ mod test {
 
         kv.drop(Resource::new_own(rep))?;
 
-        assert!(matches!(
-            kv.exists(Resource::new_own(rep), "bar".to_owned()).await?,
-            Err(Error::InvalidStore)
-        ));
-
         Ok(())
     }
 }

crates/key-value/src/lib.rs

@@ -1,4 +1,4 @@
-use anyhow::Result;
+use anyhow::{Context, Result};
 use spin_app::MetadataKey;
 use spin_core::{async_trait, wasmtime::component::Resource};
 use spin_world::v2::key_value;
@@ -55,6 +55,10 @@ impl KeyValueDispatch {
         self.allowed_stores = allowed_stores;
         self.manager = manager;
     }
+
+    pub fn get_store(&self, store: Resource<key_value::Store>) -> anyhow::Result<&Arc<dyn Store>> {
+        self.stores.get(store.rep()).context("invalid store")
+    }
 }
 
 impl Default for KeyValueDispatch {
@@ -88,14 +92,8 @@ impl key_value::HostStore for KeyValueDispatch {
         store: Resource<key_value::Store>,
         key: String,
     ) -> Result<Result<Option<Vec<u8>>, Error>> {
-        Ok(async {
-            self.stores
-                .get(store.rep())
-                .ok_or(Error::InvalidStore)?
-                .get(&key)
-                .await
-        }
-        .await)
+        let store = self.get_store(store)?;
+        Ok(store.get(&key).await)
     }
 
     async fn set(
@@ -104,58 +102,34 @@ impl key_value::HostStore for KeyValueDispatch {
         key: String,
         value: Vec<u8>,
     ) -> Result<Result<(), Error>> {
-        Ok(async {
-            self.stores
-                .get(store.rep())
-                .ok_or(Error::InvalidStore)?
-                .set(&key, &value)
-                .await
-        }
-        .await)
+        let store = self.get_store(store)?;
+        Ok(store.set(&key, &value).await)
     }
 
     async fn delete(
         &mut self,
         store: Resource<key_value::Store>,
         key: String,
     ) -> Result<Result<(), Error>> {
-        Ok(async {
-            self.stores
-                .get(store.rep())
-                .ok_or(Error::InvalidStore)?
-                .delete(&key)
-                .await
-        }
-        .await)
+        let store = self.get_store(store)?;
+        Ok(store.delete(&key).await)
     }
 
     async fn exists(
         &mut self,
         store: Resource<key_value::Store>,
         key: String,
     ) -> Result<Result<bool, Error>> {
-        Ok(async {
-            self.stores
-                .get(store.rep())
-                .ok_or(Error::InvalidStore)?
-                .exists(&key)
-                .await
-        }
-        .await)
+        let store = self.get_store(store)?;
+        Ok(store.exists(&key).await)
     }
 
     async fn get_keys(
         &mut self,
         store: Resource<key_value::Store>,
     ) -> Result<Result<Vec<String>, Error>> {
-        Ok(async {
-            self.stores
-                .get(store.rep())
-                .ok_or(Error::InvalidStore)?
-                .get_keys()
-                .await
-        }
-        .await)
+        let store = self.get_store(store)?;
+        Ok(store.get_keys().await)
     }
 
     fn drop(&mut self, store: Resource<key_value::Store>) -> Result<()> {
@@ -176,7 +150,6 @@ fn to_legacy_error(value: key_value::Error) -> LegacyError {
         Error::StoreTableFull => LegacyError::StoreTableFull,
         Error::NoSuchStore => LegacyError::NoSuchStore,
         Error::AccessDenied => LegacyError::AccessDenied,
-        Error::InvalidStore => LegacyError::InvalidStore,
         Error::Io(s) => LegacyError::Io(s),
     }
 }

wit/preview2/key-value.wit

@@ -41,9 +41,6 @@ interface key-value {
     /// (which may or may not exist).
     access-denied,
 
-    /// The store handle provided is not recognized
-    invalid-store,
-
     /// Some implementation-specific error has occurred (e.g. I/O)
     io(string)
   }