about summary refs log tree commit diff
path: root/tvix/store/src/errors.rs
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-09-21T19·32+0300
committerclbot <clbot@tvl.fyi>2023-09-22T12·51+0000
commit32f41458c0a0f62bf906021ef096c465ccc45581 (patch)
tree3aaab8c453871f39c46fb43f8278aa933b24519d /tvix/store/src/errors.rs
parentd8ef0cfb4a859af7e33828b013356412d02532da (diff)
refactor(tvix): move castore into tvix-castore crate r/6629
This splits the pure content-addressed layers from tvix-store into a
`castore` crate, and only leaves PathInfo related things, as well as the
CLI entrypoint in the tvix-store crate.

Notable changes:
 - `fixtures` and `utils` had to be moved out of the `test` cfg, so they
   can be imported from tvix-store.
 - Some ad-hoc fixtures in the test were moved to proper fixtures in the
   same step.
 - The protos are now created by a (more static) recipe in the protos/
   directory.

The (now two) golang targets are commented out, as it's not possible to
update them properly in the same CL. This will be done by a followup CL
once this is merged (and whitby deployed)

Bug: https://b.tvl.fyi/issues/301

Change-Id: I8d675d4bf1fb697eb7d479747c1b1e3635718107
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9370
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to 'tvix/store/src/errors.rs')
-rw-r--r--tvix/store/src/errors.rs45
1 files changed, 0 insertions, 45 deletions
diff --git a/tvix/store/src/errors.rs b/tvix/store/src/errors.rs
deleted file mode 100644
index 3b23f972b045..000000000000
--- a/tvix/store/src/errors.rs
+++ /dev/null
@@ -1,45 +0,0 @@
-use std::sync::PoisonError;
-use thiserror::Error;
-use tokio::task::JoinError;
-use tonic::Status;
-
-/// Errors related to communication with the store.
-#[derive(Debug, Error)]
-pub enum Error {
-    #[error("invalid request: {0}")]
-    InvalidRequest(String),
-
-    #[error("internal storage error: {0}")]
-    StorageError(String),
-}
-
-impl<T> From<PoisonError<T>> for Error {
-    fn from(value: PoisonError<T>) -> Self {
-        Error::StorageError(value.to_string())
-    }
-}
-
-impl From<JoinError> for Error {
-    fn from(value: JoinError) -> Self {
-        Error::StorageError(value.to_string())
-    }
-}
-
-impl From<Error> for Status {
-    fn from(value: Error) -> Self {
-        match value {
-            Error::InvalidRequest(msg) => Status::invalid_argument(msg),
-            Error::StorageError(msg) => Status::data_loss(format!("storage error: {}", msg)),
-        }
-    }
-}
-
-// TODO: this should probably go somewhere else?
-impl From<Error> for std::io::Error {
-    fn from(value: Error) -> Self {
-        match value {
-            Error::InvalidRequest(msg) => Self::new(std::io::ErrorKind::InvalidInput, msg),
-            Error::StorageError(msg) => Self::new(std::io::ErrorKind::Other, msg),
-        }
-    }
-}