From 5ea24254a91c3794ceb69e68c940b13f5447f40c Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Tue, 13 Feb 2024 12:55:41 +0100
Subject: [import-netapp] import Netapp code into Garage codebase

---
 src/util/Cargo.toml |  3 +--
 src/util/data.rs    | 10 +++++-----
 src/util/error.rs   |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/util')

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),
-- 
cgit v1.2.3