Merge branch 'master' into mwu/build-hybrid-for-goth

golemfactory · Nov 16, 2021 · 8944eaa · 8944eaa
2 parents 3428fa1 + 7a45275
commit 8944eaa
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 44 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/core/model/src/payment.rs b/core/model/src/payment.rs
@@ -470,7 +470,7 @@ pub mod local {
 
     #[derive(StructOpt, Debug, Clone)]
     pub struct AccountCli {
-        /// Wallet address [default: <DEFAULT_IDENTIDITY>]
+        /// Wallet address [default: <DEFAULT_IDENTITY>]
         #[structopt(long, env = "YA_ACCOUNT")]
         pub account: Option<NodeId>,
         /// Payment driver

diff --git a/core/net/Cargo.toml b/core/net/Cargo.toml
@@ -7,12 +7,12 @@ edition = "2018"
 [features]
 default = []
 service = []
-hybrid-net = ["ya-relay-server", "ya-relay-proto", "ya-sb-proto", "bytes", "ethsign", "tokio-util", "url", "prost", "rand"]
+hybrid-net = ["ya-relay-client", "ya-relay-proto", "ya-sb-proto", "bytes", "ethsign", "tokio-util", "url", "prost", "rand"]
 
 [dependencies]
 ya-core-model = { version = "^0.4", features=["net", "identity"] }
-ya-relay-server = { git = "https://github.com/golemfactory/ya-relay.git", rev = "972c05bc5a9217d65c7095a3917e8735bb241825", optional = true }
-ya-relay-proto = { git = "https://github.com/golemfactory/ya-relay.git", rev = "972c05bc5a9217d65c7095a3917e8735bb241825", features = ["codec"], optional = true }
+ya-relay-client = { git = "https://github.com/golemfactory/ya-relay.git", rev = "26a4099c7c55f8ae53ae459e4c58f3c639a183af", optional = true }
+ya-relay-proto = { git = "https://github.com/golemfactory/ya-relay.git", rev = "26a4099c7c55f8ae53ae459e4c58f3c639a183af", features = ["codec"], optional = true }
 ya-sb-proto = { version = "0.4", optional = true }
 ya-service-api = "0.1"
 ya-service-api-interfaces = "0.1"

diff --git a/core/net/src/hybrid/crypto.rs b/core/net/src/hybrid/crypto.rs
@@ -8,7 +8,7 @@ use futures::future::LocalBoxFuture;
 use futures::FutureExt;
 
 use ya_core_model::{identity, NodeId};
-use ya_relay_server::crypto::{Crypto, CryptoProvider};
+use ya_relay_client::crypto::{Crypto, CryptoProvider};
 use ya_service_bus::RpcEndpoint;
 
 pub struct IdentityCryptoProvider {

diff --git a/core/net/src/hybrid/service.rs b/core/net/src/hybrid/service.rs
@@ -18,9 +18,8 @@ use url::Url;
 
 use ya_core_model::net::{self, net_service};
 use ya_core_model::NodeId;
+use ya_relay_client::{client::ForwardReceiver, Client, ClientBuilder};
 use ya_relay_proto::codec::forward::{PrefixedSink, PrefixedStream, SinkKind};
-use ya_relay_server::testing::client::ForwardReceiver;
-use ya_relay_server::testing::{Client, ClientBuilder};
 use ya_sb_proto::codec::GsbMessage;
 use ya_sb_proto::CallReplyCode;
 use ya_service_bus::{untyped as local_bus, Error, ResponseChunk};

diff --git a/core/payment/src/cli.rs b/core/payment/src/cli.rs
@@ -55,7 +55,7 @@ pub enum PaymentCli {
         account: pay::AccountCli,
         #[structopt(
             long,
-            help = "Optional address to exit to [default: <DEFAULT_IDENTIDITY>]"
+            help = "Optional address to exit to [default: <DEFAULT_IDENTITY>]"
         )]
         to_address: Option<String>,
         #[structopt(long, help = "Optional amount to exit [default: <ALL_FUNDS>]")]