Remove uuid from rpc module + remove unecessary clone

tezedge · Sep 29, 2021 · 97403bf · 97403bf
1 parent 2b7d21e
commit 97403bf
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
@@ -24,7 +24,6 @@ url = "2.2"
 rusqlite = "0.25.1"
 cached = "0.23"
 bincode = "1.3"
-uuid = { git = "https://github.com/tezedge/uuid", tag = "v0.8.2-cleanup-unsafe-1", default-features = false, features = ["v4"] }
 # local dependencies
 crypto = { path = "../crypto" }
 # TODO: once full integration is done, remove shell dependency from here

diff --git a/rpc/src/server/mod.rs b/rpc/src/server/mod.rs
@@ -53,8 +53,8 @@ pub struct RpcCollectedState {
 }
 
 impl StreamCounter for RpcCollectedState {
-    fn get_streams(&self) -> StreamWakers {
-        self.streams.clone()
+    fn get_streams(&self) -> &StreamWakers {
+        &self.streams
     }
 
     fn get_mutable_streams(&mut self) -> &mut StreamWakers {

diff --git a/rpc/src/services/stream_services.rs b/rpc/src/services/stream_services.rs
@@ -11,11 +11,10 @@ use serde_json::Value;
 use slog::{error, Logger};
 use tezos_api::ffi::{Applied, Errored};
 use tezos_messages::p2p::encoding::operation::Operation;
-use uuid::Uuid;
 
 use crypto::hash::{BlockHash, ChainId, OperationHash, ProtocolHash};
 use shell::mempool::CurrentMempoolStateStorageRef;
-use shell_integration::StreamCounter;
+use shell_integration::{generate_stream_id, StreamCounter, StreamId};
 use storage::{BlockHeaderWithHash, BlockMetaStorage, BlockMetaStorageReader, PersistentStorage};
 use tezos_messages::{ts_to_rfc3339, TimestampOutOfRangeError};
 
@@ -176,7 +175,7 @@ pub struct HeadMonitorStream {
     last_checked_head: Option<BlockHash>,
     protocol: Option<ProtocolHash>,
     contains_waker: bool,
-    stream_id: Uuid,
+    stream_id: StreamId,
     log: Logger,
 }
 
@@ -187,7 +186,7 @@ pub struct OperationMonitorStream {
     last_checked_head: BlockHash,
     log: Logger,
     contains_waker: bool,
-    stream_id: Uuid,
+    stream_id: StreamId,
     streamed_operations: HashSet<String>,
     query: MempoolOperationsQuery,
     poll_counter: usize,
@@ -202,7 +201,7 @@ impl OperationMonitorStream {
         last_checked_head: BlockHash,
         mempool_operaions_query: MempoolOperationsQuery,
     ) -> Self {
-        let stream_id = Uuid::new_v4();
+        let stream_id: StreamId = generate_stream_id();
         Self {
             _chain_id,
             current_mempool_state_storage,
@@ -306,7 +305,7 @@ impl HeadMonitorStream {
         persistent_storage: &PersistentStorage,
         log: Logger,
     ) -> Self {
-        let stream_id = Uuid::new_v4();
+        let stream_id = generate_stream_id();
         Self {
             state,
             protocol,

diff --git a/shell-integration/src/streaming_state.rs b/shell-integration/src/streaming_state.rs
@@ -7,10 +7,11 @@ use futures::task::Waker;
 use uuid::Uuid;
 
 pub type StreamWakers = HashMap<Uuid, Waker>;
+pub type StreamId = Uuid;
 
 pub trait StreamCounter {
     fn get_mutable_streams(&mut self) -> &mut StreamWakers;
-    fn get_streams(&self) -> StreamWakers;
+    fn get_streams(&self) -> &StreamWakers;
 
     fn add_stream(&mut self, id: Uuid, waker: Waker) {
         let streams = self.get_mutable_streams();
@@ -28,3 +29,7 @@ pub trait StreamCounter {
         streams.iter().for_each(|(_, waker)| waker.wake_by_ref())
     }
 }
+
+pub fn generate_stream_id() -> StreamId {
+    Uuid::new_v4()
+}
diff --git a/shell/src/mempool/mempool_state.rs b/shell/src/mempool/mempool_state.rs
@@ -41,8 +41,8 @@ pub struct MempoolState {
 }
 
 impl StreamCounter for MempoolState {
-    fn get_streams(&self) -> StreamWakers {
-        self.streams.clone()
+    fn get_streams(&self) -> &StreamWakers {
+        &self.streams
     }
 
     fn get_mutable_streams(&mut self) -> &mut StreamWakers {