This commit is contained in:
marin postma 2021-06-17 14:38:52 +02:00
parent abdf642d68
commit fa573dabf0
No known key found for this signature in database
GPG key ID: 6088B7721C3E39F9
10 changed files with 19 additions and 18 deletions

View file

@ -141,9 +141,11 @@ mod test {
use super::*;
use crate::index_controller::index_actor::MockIndexActorHandle;
use crate::index_controller::update_actor::{
MockUpdateActorHandle, UpdateActorHandleImpl, error::UpdateActorError,
error::UpdateActorError, MockUpdateActorHandle, UpdateActorHandleImpl,
};
use crate::index_controller::uuid_resolver::{
error::UuidResolverError, MockUuidResolverHandle,
};
use crate::index_controller::uuid_resolver::{MockUuidResolverHandle, error::UuidResolverError};
#[actix_rt::test]
async fn test_normal() {

View file

@ -7,6 +7,7 @@ use crate::index_controller::index_actor::error::IndexActorError;
pub type Result<T> = std::result::Result<T, UpdateActorError>;
#[derive(Debug, thiserror::Error)]
#[allow(clippy::large_enum_variant)]
pub enum UpdateActorError {
#[error("Update {0} doesn't exist.")]
UnexistingUpdate(u64),
@ -33,8 +34,7 @@ impl From<tokio::sync::oneshot::error::RecvError> for UpdateActorError {
}
internal_error!(
UpdateActorError:
heed::Error,
UpdateActorError: heed::Error,
std::io::Error,
serde_json::Error,
actix_http::error::PayloadError,

View file

@ -4,7 +4,7 @@ use log::{info, warn};
use tokio::sync::mpsc;
use uuid::Uuid;
use super::{Result, UuidResolveMsg, error::UuidResolverError, UuidStore};
use super::{error::UuidResolverError, Result, UuidResolveMsg, UuidStore};
pub struct UuidResolverActor<S> {
inbox: mpsc::Receiver<UuidResolveMsg>,

View file

@ -10,9 +10,9 @@ use std::path::PathBuf;
use uuid::Uuid;
use actor::UuidResolverActor;
use error::Result;
use message::UuidResolveMsg;
use store::UuidStore;
use error::Result;
#[cfg(test)]
use mockall::automock;
@ -22,7 +22,6 @@ pub use store::HeedUuidStore;
const UUID_STORE_SIZE: usize = 1_073_741_824; //1GiB
#[async_trait::async_trait]
#[cfg_attr(test, automock)]
pub trait UuidResolverHandle {

View file

@ -8,7 +8,7 @@ use heed::{CompactionOption, Database, Env, EnvOpenOptions};
use serde::{Deserialize, Serialize};
use uuid::Uuid;
use super::{Result, error::UuidResolverError, UUID_STORE_SIZE};
use super::{error::UuidResolverError, Result, UUID_STORE_SIZE};
use crate::helpers::EnvSizer;
#[derive(Serialize, Deserialize)]