gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bump tonic, prost, tarpc, tokio (#15013)

Browse Source 
* Update tonic & prost, and regenerate proto

* Reignore doc code

* Revert pull #14367, but pin tokio to v0.2 for jsonrpc

* Bump backoff and goauth -> and therefore tokio

* Bump tokio in faucet, net-utils

* Bump remaining tokio, plus tarpc
This commit is contained in:
Tyera Eulberg
2021-02-05 00:21:53 -07:00
committed by GitHub
parent 863f08f8d3
commit d1563f0ccd
33 changed files with 927 additions and 689 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-utils/Cargo.toml
View File

@ -20,7 +20,7 @@ socket2 = "0.3.17"
solana-clap-utils = { path = "../clap-utils", version = "1.6.0" }
solana-logger = { path = "../logger", version = "1.6.0" }
solana-version = { path = "../version", version = "1.6.0" }
tokio = { version = "0.3.5", features = ["full"] }
tokio = { version = "1.1", features = ["full"] }
url = "2.1.1"
[lib]

6
net-utils/src/ip_echo_server.rs
View File

@ -4,8 +4,8 @@ use {
serde_derive::{Deserialize, Serialize},
std::{io, net::SocketAddr, time::Duration},
tokio::{
io::{AsyncReadExt, AsyncWriteExt},
net::{TcpListener, TcpStream},
prelude::*,
runtime::{self, Runtime},
time::timeout,
},
@ -103,14 +103,14 @@ async fn process_connection(mut socket: TcpStream, peer_addr: SocketAddr) -> io:
if *tcp_port != 0 {
debug!("Connecting to tcp/{}", tcp_port);
let tcp_stream = timeout(
let mut tcp_stream = timeout(
IO_TIMEOUT,
TcpStream::connect(&SocketAddr::new(peer_addr.ip(), *tcp_port)),
)
.await??;
debug!("Connection established to tcp/{}", *tcp_port);
let _ = tcp_stream.shutdown(std::net::Shutdown::Both);
let _ = tcp_stream.shutdown();
}
}