Rename garage_core to garage_model

8 files changed, 18 insertions, 18 deletions

diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml
index 56e0e2a8..99838a56 100644
--- a/src/api/Cargo.toml
+++ b/src/api/Cargo.toml
@@ -12,7 +12,7 @@ path = "lib.rs"
 [dependencies]
 garage_util = { path = "../util" }
 garage_table = { path = "../table" }
-garage_core = { path = "../core" }
+garage_model = { path = "../model" }
 
 bytes = "0.4"
 hex = "0.3"
diff --git a/src/api/api_server.rs b/src/api/api_server.rs
index 32506ccd..699dc5c4 100644
--- a/src/api/api_server.rs
+++ b/src/api/api_server.rs
@@ -9,7 +9,7 @@ use hyper::{Body, Method, Request, Response, Server};
 
 use garage_util::error::Error;
 
-use garage_core::garage::Garage;
+use garage_model::garage::Garage;
 
 use crate::http_util::*;
 use crate::signature::check_signature;
diff --git a/src/api/s3_copy.rs b/src/api/s3_copy.rs
index f8eaa0e7..6a8d8f87 100644
--- a/src/api/s3_copy.rs
+++ b/src/api/s3_copy.rs
@@ -8,10 +8,10 @@ use garage_table::*;
 use garage_util::data::*;
 use garage_util::error::Error;
 
-use garage_core::block_ref_table::*;
-use garage_core::garage::Garage;
-use garage_core::object_table::*;
-use garage_core::version_table::*;
+use garage_model::block_ref_table::*;
+use garage_model::garage::Garage;
+use garage_model::object_table::*;
+use garage_model::version_table::*;
 
 use crate::http_util::*;
 
diff --git a/src/api/s3_delete.rs b/src/api/s3_delete.rs
index e77ab314..60714b0c 100644
--- a/src/api/s3_delete.rs
+++ b/src/api/s3_delete.rs
@@ -6,8 +6,8 @@ use hyper::{Body, Request, Response};
 use garage_util::data::*;
 use garage_util::error::Error;
 
-use garage_core::garage::Garage;
-use garage_core::object_table::*;
+use garage_model::garage::Garage;
+use garage_model::object_table::*;
 
 use crate::encoding::*;
 use crate::http_util::*;
diff --git a/src/api/s3_get.rs b/src/api/s3_get.rs
index 3ed0f914..63200ca3 100644
--- a/src/api/s3_get.rs
+++ b/src/api/s3_get.rs
@@ -9,8 +9,8 @@ use garage_util::error::Error;
 
 use garage_table::EmptyKey;
 
-use garage_core::garage::Garage;
-use garage_core::object_table::*;
+use garage_model::garage::Garage;
+use garage_model::object_table::*;
 
 use crate::http_util::*;
 
diff --git a/src/api/s3_list.rs b/src/api/s3_list.rs
index b8babbbf..c4fbf6f2 100644
--- a/src/api/s3_list.rs
+++ b/src/api/s3_list.rs
@@ -7,7 +7,7 @@ use hyper::Response;
 
 use garage_util::error::Error;
 
-use garage_core::garage::Garage;
+use garage_model::garage::Garage;
 
 use crate::encoding::*;
 use crate::http_util::*;
diff --git a/src/api/s3_put.rs b/src/api/s3_put.rs
index e1e4c02d..bddfa444 100644
--- a/src/api/s3_put.rs
+++ b/src/api/s3_put.rs
@@ -9,11 +9,11 @@ use garage_table::*;
 use garage_util::data::*;
 use garage_util::error::Error;
 
-use garage_core::block::INLINE_THRESHOLD;
-use garage_core::block_ref_table::*;
-use garage_core::garage::Garage;
-use garage_core::object_table::*;
-use garage_core::version_table::*;
+use garage_model::block::INLINE_THRESHOLD;
+use garage_model::block_ref_table::*;
+use garage_model::garage::Garage;
+use garage_model::object_table::*;
+use garage_model::version_table::*;
 
 use crate::encoding::*;
 use crate::http_util::*;
diff --git a/src/api/signature.rs b/src/api/signature.rs
index a1ccfd08..65f31f21 100644
--- a/src/api/signature.rs
+++ b/src/api/signature.rs
@@ -8,8 +8,8 @@ use sha2::{Digest, Sha256};
 use garage_table::*;
 use garage_util::error::Error;
 
-use garage_core::garage::Garage;
-use garage_core::key_table::*;
+use garage_model::garage::Garage;
+use garage_model::key_table::*;
 
 use crate::encoding::uri_encode;