aboutsummaryrefslogtreecommitdiff
path: root/src/util
diff options
context:
space:
mode:
authorAlex <alex@adnab.me>2024-02-15 12:51:52 +0000
committerAlex <alex@adnab.me>2024-02-15 12:51:52 +0000
commit7be3f15e45fcfff10a45302a040c2919a3ba8ccd (patch)
treeeb32dadec4de88e5ec69dbdf5e73f68f9299201a /src/util
parenta2ab275da80159ea2f0606d129790d79d43b4e24 (diff)
parent125c662860621f9c834e254d62b29b5d5ace5dd4 (diff)
downloadgarage-7be3f15e45fcfff10a45302a040c2919a3ba8ccd.tar.gz
garage-7be3f15e45fcfff10a45302a040c2919a3ba8ccd.zip
Merge pull request 'import Netapp code into Garage codebase' (#717) from import-netapp into main
Reviewed-on: https://git.deuxfleurs.fr/Deuxfleurs/garage/pulls/717
Diffstat (limited to 'src/util')
-rw-r--r--src/util/Cargo.toml3
-rw-r--r--src/util/data.rs10
-rw-r--r--src/util/error.rs4
3 files changed, 8 insertions, 9 deletions
diff --git a/src/util/Cargo.toml b/src/util/Cargo.toml
index f4e53e1a..b4d8477c 100644
--- a/src/util/Cargo.toml
+++ b/src/util/Cargo.toml
@@ -15,6 +15,7 @@ path = "lib.rs"
[dependencies]
garage_db.workspace = true
+garage_net.workspace = true
arc-swap.workspace = true
async-trait.workspace = true
@@ -40,8 +41,6 @@ toml.workspace = true
futures.workspace = true
tokio.workspace = true
-netapp.workspace = true
-
http.workspace = true
hyper.workspace = true
diff --git a/src/util/data.rs b/src/util/data.rs
index bdd8daee..2579fd1b 100644
--- a/src/util/data.rs
+++ b/src/util/data.rs
@@ -85,15 +85,15 @@ impl FixedBytes32 {
}
}
-impl From<netapp::NodeID> for FixedBytes32 {
- fn from(node_id: netapp::NodeID) -> FixedBytes32 {
+impl From<garage_net::NodeID> for FixedBytes32 {
+ fn from(node_id: garage_net::NodeID) -> FixedBytes32 {
FixedBytes32::try_from(node_id.as_ref()).unwrap()
}
}
-impl From<FixedBytes32> for netapp::NodeID {
- fn from(bytes: FixedBytes32) -> netapp::NodeID {
- netapp::NodeID::from_slice(bytes.as_slice()).unwrap()
+impl From<FixedBytes32> for garage_net::NodeID {
+ fn from(bytes: FixedBytes32) -> garage_net::NodeID {
+ garage_net::NodeID::from_slice(bytes.as_slice()).unwrap()
}
}
diff --git a/src/util/error.rs b/src/util/error.rs
index 3fcee71d..e73d88ba 100644
--- a/src/util/error.rs
+++ b/src/util/error.rs
@@ -24,8 +24,8 @@ pub enum Error {
#[error(display = "Invalid HTTP header value: {}", _0)]
HttpHeader(#[error(source)] http::header::ToStrError),
- #[error(display = "Netapp error: {}", _0)]
- Netapp(#[error(source)] netapp::error::Error),
+ #[error(display = "Network error: {}", _0)]
+ Net(#[error(source)] garage_net::error::Error),
#[error(display = "DB error: {}", _0)]
Db(#[error(source)] garage_db::Error),