Replace tokio_core with tokio (ring -> 0.13) (#9657)
* Replace `tokio_core` with `tokio`.
* Remove `tokio-core` and replace with `tokio` in
- `ethcore/stratum`
- `secret_store`
- `util/fetch`
- `util/reactor`
* Bump hyper to 0.12 in
- `miner`
- `util/fake-fetch`
- `util/fetch`
- `secret_store`
* Bump `jsonrpc-***` to 0.9 in
- `parity`
- `ethcore/stratum`
- `ipfs`
- `rpc`
- `rpc_client`
- `whisper`
* Bump `ring` to 0.13
* Use a more graceful shutdown process in `secret_store` tests.
* Convert some mutexes to rwlocks in `secret_store`.
* Consolidate Tokio Runtime use, remove `CpuPool`.
* Rename and move the `tokio_reactor` crate (`util/reactor`) to
`tokio_runtime` (`util/runtime`).
* Rename `EventLoop` to `Runtime`.
- Rename `EventLoop::spawn` to `Runtime::with_default_thread_count`.
- Add the `Runtime::with_thread_count` method.
- Rename `Remote` to `Executor`.
* Remove uses of `CpuPool` and spawn all tasks via the `Runtime` executor
instead.
* Other changes related to `CpuPool` removal:
- Remove `Reservations::with_pool`. `::new` now takes an `Executor` as an argument.
- Remove `SenderReservations::with_pool`. `::new` now takes an `Executor` as an argument.
This commit is contained in:
committed by
Afri Schoedon
parent
b8da38f4e4
commit
68ca8df22f
@@ -20,7 +20,7 @@ use std::time::{Instant, Duration};
|
||||
|
||||
use ansi_term::Colour;
|
||||
use ethereum_types::U256;
|
||||
use futures_cpupool::CpuPool;
|
||||
use parity_runtime::Executor;
|
||||
use price_info::{Client as PriceInfoClient, PriceInfo};
|
||||
use price_info::fetch::Client as FetchClient;
|
||||
|
||||
@@ -43,7 +43,7 @@ pub struct GasPriceCalibrator {
|
||||
|
||||
impl GasPriceCalibrator {
|
||||
/// Create a new gas price calibrator.
|
||||
pub fn new(options: GasPriceCalibratorOptions, fetch: FetchClient, p: CpuPool) -> GasPriceCalibrator {
|
||||
pub fn new(options: GasPriceCalibratorOptions, fetch: FetchClient, p: Executor) -> GasPriceCalibrator {
|
||||
GasPriceCalibrator {
|
||||
options: options,
|
||||
next_calibration: Instant::now(),
|
||||
|
||||
@@ -23,7 +23,7 @@ extern crate ansi_term;
|
||||
extern crate ethcore_transaction as transaction;
|
||||
extern crate ethereum_types;
|
||||
extern crate futures;
|
||||
extern crate futures_cpupool;
|
||||
extern crate parity_runtime;
|
||||
extern crate heapsize;
|
||||
extern crate keccak_hash as hash;
|
||||
extern crate linked_hash_map;
|
||||
|
||||
@@ -18,18 +18,19 @@
|
||||
|
||||
extern crate ethash;
|
||||
extern crate fetch;
|
||||
extern crate parity_reactor;
|
||||
extern crate parity_runtime;
|
||||
extern crate url;
|
||||
extern crate hyper;
|
||||
|
||||
use self::fetch::{Fetch, Request, Client as FetchClient, Method};
|
||||
use self::parity_reactor::Remote;
|
||||
use self::parity_runtime::Executor;
|
||||
use self::ethash::SeedHashCompute;
|
||||
use self::url::Url;
|
||||
use self::hyper::header::ContentType;
|
||||
use self::hyper::header::{self, HeaderValue};
|
||||
|
||||
use ethereum_types::{H256, U256};
|
||||
use parking_lot::Mutex;
|
||||
|
||||
use futures::Future;
|
||||
|
||||
/// Trait for notifying about new mining work
|
||||
@@ -42,13 +43,13 @@ pub trait NotifyWork : Send + Sync {
|
||||
pub struct WorkPoster {
|
||||
urls: Vec<Url>,
|
||||
client: FetchClient,
|
||||
remote: Remote,
|
||||
executor: Executor,
|
||||
seed_compute: Mutex<SeedHashCompute>,
|
||||
}
|
||||
|
||||
impl WorkPoster {
|
||||
/// Create new `WorkPoster`.
|
||||
pub fn new(urls: &[String], fetch: FetchClient, remote: Remote) -> Self {
|
||||
pub fn new(urls: &[String], fetch: FetchClient, executor: Executor) -> Self {
|
||||
let urls = urls.into_iter().filter_map(|u| {
|
||||
match Url::parse(u) {
|
||||
Ok(url) => Some(url),
|
||||
@@ -60,7 +61,7 @@ impl WorkPoster {
|
||||
}).collect();
|
||||
WorkPoster {
|
||||
client: fetch,
|
||||
remote: remote,
|
||||
executor: executor,
|
||||
urls: urls,
|
||||
seed_compute: Mutex::new(SeedHashCompute::default()),
|
||||
}
|
||||
@@ -80,9 +81,9 @@ impl NotifyWork for WorkPoster {
|
||||
|
||||
for u in &self.urls {
|
||||
let u = u.clone();
|
||||
self.remote.spawn(self.client.fetch(
|
||||
Request::new(u.clone(), Method::Post)
|
||||
.with_header(ContentType::json())
|
||||
self.executor.spawn(self.client.fetch(
|
||||
Request::new(u.clone(), Method::POST)
|
||||
.with_header(header::CONTENT_TYPE, HeaderValue::from_static("application/json"))
|
||||
.with_body(body.clone()), Default::default()
|
||||
).map_err(move |e| {
|
||||
warn!("Error sending HTTP notification to {} : {}, retrying", u, e);
|
||||
|
||||
Reference in New Issue
Block a user