Move transfers to exe-unit components

Cargo.toml

@@ -54,7 +54,7 @@ ya-service-api-web = "0.2"
 ya-service-bus = "0.6.1"
 ya-sgx = "0.2"
 ya-utils-path = "0.1"
-ya-utils-futures = "0.2"
+ya-utils-futures = "0.3"
 ya-utils-process = { version = "0.2", features = ["lock"] }
 ya-utils-networking = "0.2"
 ya-fd-metrics = { path = "utils/fd-metrics" }
@@ -202,6 +202,7 @@ members = [
     "exe-unit",
     "exe-unit/runtime-api",
     "exe-unit/tokio-process-ns",
+    "exe-unit/components/transfer",
     "golem_cli",
     "utils/actix_utils",
     "utils/agreement-utils",
@@ -215,7 +216,6 @@ members = [
     "utils/path",
     "utils/process",
     "utils/std-utils",
-    "utils/transfer",
     "utils/diesel-utils",
     "utils/fd-metrics",
     "core/metrics",
@@ -290,7 +290,7 @@ ya-compile-time-utils = { path = "utils/compile-time-utils" }
 ya-exe-unit = { path = "exe-unit" }
 ya-file-logging = { path = "utils/file-logging" }
 ya-manifest-utils = { path = "utils/manifest-utils" }
-ya-transfer = { path = "utils/transfer" }
+ya-transfer = { path = "exe-unit/components/transfer" }
 ya-utils-actix = { path = "utils/actix_utils" }
 ya-utils-cli = { path = "utils/cli" }
 ya-utils-futures = { path = "utils/futures" }

core/payment-driver/erc20/Cargo.toml

@@ -45,7 +45,7 @@ trust-dns-resolver = { workspace = true }
 ya-payment-driver = "0.3"
 ya-client-model = "0.5"
 ya-service-api-interfaces = "0.2"
-ya-utils-futures = "0.2"
+ya-utils-futures = "0.3"
 ya-utils-networking = "0.2"
 erc20_payment_lib = { workspace = true }
 

core/payment-driver/erc20next/Cargo.toml

@@ -44,7 +44,7 @@ web3 = { version = "0.19.0", default-features = false, features = [
 ya-payment-driver = "0.3"
 ya-client-model = "0.5"
 ya-service-api-interfaces = "0.2"
-ya-utils-futures = "0.2"
+ya-utils-futures = "0.3"
 ya-utils-networking = "0.2"
 erc20_payment_lib = { workspace = true }
 

exe-unit/Cargo.toml

@@ -47,6 +47,7 @@ ya-runtime-api = { version = "0.7", path = "runtime-api", features = [
 ya-service-bus = "0.6.1"
 ya-transfer = "0.3"
 ya-utils-path = "0.1"
+ya-utils-futures = "0.3"
 ya-std-utils = "0.1"
 ya-utils-networking = { version = "0.2", default-features = false, features = [
     "dns",

utils/transfer/Cargo.toml → exe-unit/components/transfer/Cargo.toml

@@ -10,6 +10,7 @@ ya-client-model = "0.5"
 ya-core-model = { version = "^0.9" }
 ya-service-bus = "0.6.1"
 ya-utils-path = "0.1"
+ya-utils-futures = "0.3"
 gftp = { version = "^0.3" }
 
 actix-http = "3"

exe-unit/src/util/cache.rs → exe-unit/components/transfer/src/cache.rs

@@ -1,12 +1,12 @@
-use crate::error::{Error, TransferError};
 use sha3::Digest;
 use std::convert::TryFrom;
 use std::io::{Error as IoError, ErrorKind as IoErrorKind};
 use std::path::{Component, PathBuf};
-use ya_transfer::TransferUrl;
+
+use crate::{error::Error as TransferError, TransferUrl};
 
 #[derive(Debug, Clone)]
-pub(crate) struct Cache {
+pub struct Cache {
     dir: PathBuf,
     #[allow(dead_code)]
     tmp_dir: PathBuf,
@@ -49,16 +49,16 @@ impl Cache {
 }
 
 impl TryFrom<ProjectedPath> for TransferUrl {
-    type Error = Error;
+    type Error = TransferError;
 
-    fn try_from(value: ProjectedPath) -> Result<Self, Error> {
+    fn try_from(value: ProjectedPath) -> Result<Self, TransferError> {
         TransferUrl::parse(
-            value.to_path_buf().to_str().ok_or_else(|| {
-                Error::local(TransferError::InvalidUrlError("Invalid path".to_owned()))
-            })?,
+            value
+                .to_path_buf()
+                .to_str()
+                .ok_or_else(|| TransferError::InvalidUrlError("Invalid path".to_owned()))?,
             "file",
         )
-        .map_err(Error::local)
     }
 }
 

utils/transfer/src/lib.rs → exe-unit/components/transfer/src/lib.rs

@@ -1,4 +1,5 @@
 mod archive;
+pub mod cache;
 pub mod error;
 mod file;
 mod gftp;

exe-unit/src/lib.rs

@@ -45,8 +45,6 @@ pub mod process;
 pub mod runtime;
 pub mod service;
 pub mod state;
-pub mod util;
-
 pub type Result<T> = std::result::Result<T, Error>;
 
 lazy_static::lazy_static! {

exe-unit/src/service/transfer.rs

@@ -11,13 +11,13 @@ use url::Url;
 use crate::deploy::ContainerVolume;
 use crate::error::Error;
 use crate::message::Shutdown;
-use crate::util::cache::Cache;
-use crate::util::Abort;
 use crate::{ExeUnitContext, Result};
 
 use ya_client_model::activity::TransferArgs;
+use ya_transfer::cache::Cache;
 use ya_transfer::error::Error as TransferError;
 use ya_transfer::*;
+use ya_utils_futures::abort::Abort;
 
 #[derive(Clone, Debug, Message)]
 #[rtype(result = "Result<()>")]

utils/futures/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ya-utils-futures"
-version = "0.2.0"
+version = "0.3.0"
 authors = ["Golem Factory <contact@golem.network>"]
 edition = "2018"
 

exe-unit/src/util/mod.rs → utils/futures/src/abort.rs

@@ -1,10 +1,8 @@
-use futures::future::{AbortHandle, AbortRegistration};
+use futures3::future::{AbortHandle, AbortRegistration};
 use std::cmp::Eq;
 use std::hash::Hash;
 use std::sync::atomic::{AtomicUsize, Ordering};
 
-pub mod cache;
-
 /// Allows storing AbortHandle objects in a container
 #[derive(Clone, Debug)]
 pub struct Abort {

utils/futures/src/lib.rs

@@ -1 +1,2 @@
+pub mod abort;
 pub mod timeout;