Merge pull request #2913 from golemfactory/extract-exeunit-transfer-c…

…omponent

ExeUnit transfer component separation

.github/workflows/market-test-suite.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [ macos-latest, windows-latest, ubuntu-latest ]
 
     steps:
       - name: Checkout

.github/workflows/payment-test.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [ macos-latest, windows-latest, ubuntu-latest ]
 
     steps:
       - name: Checkout

.github/workflows/unit-test.yml

@@ -33,7 +33,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
+        os: [ macos-latest, windows-latest, ubuntu-latest ]
 
     steps:
       - name: Checkout

Cargo.toml

@@ -15,7 +15,7 @@ static-openssl = ["openssl/vendored", "openssl-probe"]
 dummy-driver = ['ya-dummy-driver']
 erc20-driver = ['ya-erc20-driver']
 tos = []
-framework-test = []
+framework-test = ['ya-exe-unit/framework-test']
 # Temporary to make goth integration tests work
 central-net = ['ya-net/central-net']
 packet-trace-enable = [
@@ -52,7 +52,7 @@ ya-service-api-web = "0.2"
 ya-service-bus = { workspace = true }
 ya-sgx = "0.2"
 ya-utils-path = "0.1"
-ya-utils-futures = "0.2"
+ya-utils-futures.workspace = true
 ya-utils-process = { version = "0.2", features = ["lock"] }
 ya-utils-networking = "0.2"
 ya-fd-metrics = { path = "utils/fd-metrics" }
@@ -63,6 +63,7 @@ ya-client-model = "0.6"
 gftp = { workspace = true, optional = true }
 # just to enable gftp build for cargo-deb
 ya-provider = { version = "0.3", optional = true } # just to enable conditionally running some tests
+ya-exe-unit = { version = "0.4", optional = true, path="exe-unit" }       # just to enable conditionally running some tests
 
 actix-rt = "2.7"
 actix-service = "2"
@@ -91,6 +92,7 @@ libsqlite3-sys = { workspace = true }
 [dev-dependencies]
 erc20_processor = { workspace = true }
 ya-test-framework = "0.1"
+ya-exe-unit = { version = "0.4", path = "exe-unit" }
 
 [package.metadata.deb]
 name = "golem-requestor"
@@ -206,6 +208,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",
@@ -219,12 +222,12 @@ members = [
     "utils/path",
     "utils/process",
     "utils/std-utils",
-    "utils/transfer",
     "utils/diesel-utils",
     "utils/fd-metrics",
     "core/metrics",
     "test-utils/test-framework",
     "test-utils/test-framework/framework-macro",
+    "test-utils/test-framework/framework-basic",
 ]
 
 [workspace.dependencies]
@@ -250,6 +253,7 @@ regex = "1.10.4"
 ya-agreement-utils = { version = "0.6", path = "utils/agreement-utils" }
 ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "0588dd1af311ae19c621b04cc2a4cfd9c0483252" }
 ya-relay-stack = { git = "https://github.com/golemfactory/ya-relay.git", rev = "c92a75b0cf062fcc9dbb3ea2a034d913e5fad8e5" }
+ya-utils-futures = { path = "utils/futures" }
 
 ya-service-bus = { version = "0.7.3", features=['tls'] }
 ya-sb-router = { version = "0.6.4" }
@@ -304,10 +308,9 @@ 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" }
 ya-utils-networking = { path = "utils/networking" }
 ya-utils-path = { path = "utils/path" }
 ya-utils-process = { path = "utils/process" }
@@ -319,6 +322,7 @@ ya-provider = { path = "agent/provider" }
 ya-manifest-test-utils = { path = "utils/manifest-utils/test-utils" }
 ya-test-framework = { path = "test-utils/test-framework" }
 ya-framework-macro = { path = "test-utils/test-framework/framework-macro" }
+ya-framework-basic = { path = "test-utils/test-framework/framework-basic" }
 
 ethereum-tx-sign = { git = "https://github.com/golemfactory/ethereum-tx-sign.git", rev = "1164c74187a9e2947faeaea7dde104c3cdec4195" }
 graphene-sgx = { git = " https://github.com/golemfactory/graphene-rust.git", rev = "dbd993ebad7f9190410ea390a589348479af6407" }

core/model/src/activity.rs

@@ -388,7 +388,7 @@ pub mod local {
 pub enum RpcMessageError {
     #[error("Service error: {0}")]
     Service(String),
-    #[error("Market API error: {0}")]
+    #[error("Activity API error: {0}")]
     Activity(String),
     #[error("Bad request: {0}")]
     BadRequest(String),

core/payment-driver/erc20/Cargo.toml

@@ -46,7 +46,7 @@ ya-payment-driver = "0.3"
 ya-core-model = { version = "0.9" }
 ya-client-model = "0.6"
 ya-service-api-interfaces = "0.2"
-ya-utils-futures = "0.2"
+ya-utils-futures.workspace = true
 ya-utils-networking = "0.2"
 erc20_payment_lib = { workspace = true }