Got rid of compiler warnings

This commit is contained in:
Jedrzej Stuczynski
2019-12-18 14:44:07 +00:00
parent 441a6c3e1b
commit a958445309
3 changed files with 11 additions and 14 deletions
+2 -6
View File
@@ -14,7 +14,7 @@ use std::net::SocketAddr;
use std::net::SocketAddrV4;
use std::time::Duration;
use tokio::runtime::Runtime;
use sfw_provider_requests::requests::AuthToken;
use sfw_provider_requests::AuthToken;
pub mod directory;
pub mod mix;
@@ -155,6 +155,7 @@ impl NymClient {
let mut rt = Runtime::new()?;
let topology = get_topology(self.is_local);
// this is temporary and assumes there exists only a single provider.
let provider_address: SocketAddrV4 = topology
.mix_provider_nodes
.first()
@@ -163,8 +164,6 @@ impl NymClient {
.parse()
.unwrap();
let mut provider_client = ProviderClient::new(provider_address, self.address, self.auth_token);
rt.block_on(async {
@@ -179,9 +178,6 @@ impl NymClient {
});
return Ok(());
// don't start anything, just register
let (mix_tx, mix_rx) = mpsc::unbounded();
let mix_traffic_future = rt.spawn(MixTrafficController::run(mix_rx));
+6 -5
View File
@@ -1,11 +1,12 @@
use sfw_provider_requests::requests::{ProviderRequest, PullRequest, AuthToken, RegisterRequest};
use sfw_provider_requests::requests::{ProviderRequest, PullRequest, RegisterRequest};
use sfw_provider_requests::responses::{ProviderResponse, PullResponse, RegisterResponse, ProviderResponseError};
use std::net::{Shutdown, SocketAddr};
use std::net::Shutdown;
use std::net::SocketAddrV4;
use tokio::prelude::*;
use std::time::Duration;
use sphinx::route::DestinationAddressBytes;
use futures::io::Error;
use sfw_provider_requests::AuthToken;
#[derive(Debug)]
pub enum ProviderClientError {
@@ -66,14 +67,14 @@ impl ProviderClient {
println!("keep alive: {:?}", socket.keepalive());
socket.set_keepalive(Some(Duration::from_secs(2))).unwrap();
socket.write_all(&bytes[..]).await?;
if let Err(e) = socket.shutdown(Shutdown::Write) {
if let Err(_e) = socket.shutdown(Shutdown::Write) {
// TODO: make it a silent log once we have a proper logging library
// eprintln!("failed to close write part of the socket; err = {:?}", e)
}
let mut response = Vec::new();
socket.read_to_end(&mut response).await?;
if let Err(e) = socket.shutdown(Shutdown::Read) {
if let Err(_e) = socket.shutdown(Shutdown::Read) {
// TODO: make it a silent log once we have a proper logging library
// eprintln!("failed to close read part of the socket; err = {:?}", e)
}
@@ -85,7 +86,7 @@ impl ProviderClient {
&self,
) -> Result<Vec<Vec<u8>>, ProviderClientError> {
if self.auth_token.is_none() {
return Err(ProviderClientError::EmptyAuthTokenError)
return Err(ProviderClientError::EmptyAuthTokenError);
}
let pull_request = PullRequest::new(self.our_address, self.auth_token.unwrap());
+3 -3
View File
@@ -1,9 +1,9 @@
use crate::banner;
use crate::clients::NymClient;
use crate::persistence::pemstore;
//use crate::clients::NymClient;
//use crate::persistence::pemstore;
use clap::ArgMatches;
pub fn execute(matches: &ArgMatches) {
pub fn execute(_matches: &ArgMatches) {
println!("{}", banner());
panic!("For time being this command is deprecated! Please use 'websocket' instead");
//