From 48fcaa1fd3788f9504484fd58dd7580903e4f5d5 Mon Sep 17 00:00:00 2001
From: Peter Kotula <peto.kotula@yahoo.com>
Date: Tue, 2 Apr 2024 13:45:06 +0200
Subject: [PATCH] small fixes

---
 golem-service-base/src/model.rs                         | 2 +-
 golem-worker-service-base/src/service/worker/default.rs | 2 +-
 golem-worker-service/src/grpcapi/worker.rs              | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/golem-service-base/src/model.rs b/golem-service-base/src/model.rs
index 8b5700e9b..bcd3f71fd 100644
--- a/golem-service-base/src/model.rs
+++ b/golem-service-base/src/model.rs
@@ -19,6 +19,7 @@ use golem_common::model::{parse_function_name, ShardId, TemplateId, WorkerFilter
 use golem_wasm_ast::analysis::{AnalysedResourceId, AnalysedResourceMode};
 use http::Uri;
 use poem_openapi::{Enum, NewType, Object, Union};
+use rand::seq::IteratorRandom;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::{collections::HashMap, fmt::Display, fmt::Formatter};
 
@@ -3100,7 +3101,6 @@ impl RoutingTable {
     }
 
     pub fn random(&self) -> Option<&Pod> {
-        use rand::seq::IteratorRandom;
         self.shard_assignments
             .values()
             .choose(&mut rand::thread_rng())
diff --git a/golem-worker-service-base/src/service/worker/default.rs b/golem-worker-service-base/src/service/worker/default.rs
index 730576577..4cb0c22bf 100644
--- a/golem-worker-service-base/src/service/worker/default.rs
+++ b/golem-worker-service-base/src/service/worker/default.rs
@@ -819,7 +819,7 @@ where
                                 workers, cursor })),
                         } => {
                             let cursor: Option<u64> = if cursor == 0 { None } else { Some(cursor) };
-                            let workers = workers.iter().map(| w| w.clone().try_into()).collect::<Result<Vec<_>, _>>().map_err(|_| GolemError::Unknown(GolemErrorUnknown {
+                            let workers = workers.into_iter().map(| w| w.try_into()).collect::<Result<Vec<_>, _>>().map_err(|_| GolemError::Unknown(GolemErrorUnknown {
                                 details: "Convert response error".to_string(),
                             }))?;
                             Ok((cursor, workers))
diff --git a/golem-worker-service/src/grpcapi/worker.rs b/golem-worker-service/src/grpcapi/worker.rs
index e51dce146..95bdb0d81 100644
--- a/golem-worker-service/src/grpcapi/worker.rs
+++ b/golem-worker-service/src/grpcapi/worker.rs
@@ -383,8 +383,7 @@ impl WorkerGrpcApi {
             )
             .await?;
 
-        let result: Vec<WorkerMetadata> =
-            workers.iter().map(|worker| worker.clone().into()).collect();
+        let result: Vec<WorkerMetadata> = workers.into_iter().map(|worker| worker.into()).collect();
 
         Ok((new_cursor, result))
     }