From e656fb2d9d1da93156d95ce3086b8b80b628bdc3 Mon Sep 17 00:00:00 2001
From: Al Liu <scygliu1@gmail.com>
Date: Tue, 22 Nov 2022 22:16:07 +0800
Subject: [PATCH] Bugfix: Forget to change `overwatch` to `overwatch_rs` (#11)

* direct clone on Bytes instead of deep copy(Bytes::copy_from_slice)

* change overwatch to overwatch_rs
---
 nomos-services/src/lib.rs                   |  2 +-
 nomos-services/src/log/mod.rs               | 24 ++++++++++++++-------
 nomos-services/src/network/backends/mod.rs  |  2 +-
 nomos-services/src/network/backends/waku.rs |  2 +-
 nomos-services/src/network/mod.rs           |  2 +-
 nomos-services/src/storage/mod.rs           |  8 +++----
 6 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/nomos-services/src/lib.rs b/nomos-services/src/lib.rs
index 90b94acc..058a413f 100644
--- a/nomos-services/src/lib.rs
+++ b/nomos-services/src/lib.rs
@@ -1,3 +1,3 @@
 pub mod log;
 pub mod network;
-pub mod storage;
\ No newline at end of file
+pub mod storage;
diff --git a/nomos-services/src/log/mod.rs b/nomos-services/src/log/mod.rs
index be7d4d8e..e369c79c 100644
--- a/nomos-services/src/log/mod.rs
+++ b/nomos-services/src/log/mod.rs
@@ -1,10 +1,10 @@
-use overwatch::services::{
+use overwatch_rs::services::{
     handle::ServiceStateHandle,
     relay::NoMessage,
     state::{NoOperator, NoState},
     ServiceCore, ServiceData,
 };
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 use std::net::SocketAddr;
 use std::path::PathBuf;
 use tracing::Level;
@@ -104,16 +104,24 @@ impl ServiceCore for Logger {
     }
 }
 
-
 mod serde_level {
     use super::Level;
-    use serde::{Serializer, Serialize, Deserialize, Deserializer, de::Error};
+    use serde::{de::Error, Deserialize, Deserializer, Serialize, Serializer};
 
-    pub fn deserialize<'de, D>(deserializer: D) -> Result<Level, D::Error> where D: Deserializer<'de> {
-        <String>::deserialize(deserializer).and_then(|v| v.parse().map_err(|e| D::Error::custom(format!("invalid log level {}", e))))
+    pub fn deserialize<'de, D>(deserializer: D) -> Result<Level, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        <String>::deserialize(deserializer).and_then(|v| {
+            v.parse()
+                .map_err(|e| D::Error::custom(format!("invalid log level {}", e)))
+        })
     }
 
-    pub fn serialize<S>(value: &Level, serializer: S) -> Result<S::Ok, S::Error> where S: Serializer {
+    pub fn serialize<S>(value: &Level, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
         value.as_str().serialize(serializer)
     }
-}
\ No newline at end of file
+}
diff --git a/nomos-services/src/network/backends/mod.rs b/nomos-services/src/network/backends/mod.rs
index d9c62f96..45ca316c 100644
--- a/nomos-services/src/network/backends/mod.rs
+++ b/nomos-services/src/network/backends/mod.rs
@@ -1,5 +1,5 @@
 use super::*;
-use overwatch::services::state::ServiceState;
+use overwatch_rs::services::state::ServiceState;
 use tokio::sync::broadcast::Receiver;
 
 mod waku;
diff --git a/nomos-services/src/network/backends/waku.rs b/nomos-services/src/network/backends/waku.rs
index cdac8ed3..ab3cac79 100644
--- a/nomos-services/src/network/backends/waku.rs
+++ b/nomos-services/src/network/backends/waku.rs
@@ -1,6 +1,6 @@
 use super::*;
 use ::waku::*;
-use overwatch::services::state::NoState;
+use overwatch_rs::services::state::NoState;
 use serde::{Deserialize, Serialize};
 use tokio::sync::{
     broadcast::{self, Receiver, Sender},
diff --git a/nomos-services/src/network/mod.rs b/nomos-services/src/network/mod.rs
index 8919b595..f4d304a1 100644
--- a/nomos-services/src/network/mod.rs
+++ b/nomos-services/src/network/mod.rs
@@ -2,7 +2,7 @@ pub mod backends;
 
 use async_trait::async_trait;
 use backends::NetworkBackend;
-use overwatch::services::{
+use overwatch_rs::services::{
     handle::ServiceStateHandle,
     relay::RelayMessage,
     state::{NoOperator, ServiceState},
diff --git a/nomos-services/src/storage/mod.rs b/nomos-services/src/storage/mod.rs
index 646feb47..165d6b5d 100644
--- a/nomos-services/src/storage/mod.rs
+++ b/nomos-services/src/storage/mod.rs
@@ -6,14 +6,14 @@ use std::marker::PhantomData;
 // crates
 use async_trait::async_trait;
 use bytes::Bytes;
-use overwatch::services::handle::ServiceStateHandle;
+use overwatch_rs::services::handle::ServiceStateHandle;
 use serde::de::DeserializeOwned;
 // internal
 use crate::storage::backends::{StorageSerde, StorageTransaction};
 use backends::StorageBackend;
-use overwatch::services::relay::RelayMessage;
-use overwatch::services::state::{NoOperator, NoState};
-use overwatch::services::{ServiceCore, ServiceData, ServiceId};
+use overwatch_rs::services::relay::RelayMessage;
+use overwatch_rs::services::state::{NoOperator, NoState};
+use overwatch_rs::services::{ServiceCore, ServiceData, ServiceId};
 use serde::Serialize;
 
 /// Storage message that maps to [`StorageBackend`] trait