grassrootseconomics/openethereum
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use hyper 0.11 in ethcore-miner and improvements in parity-reactor (#8335)

Browse Source 
* parity-reactor: Pass over Handle in spawning fn to allow normal tokio ops

* Allow fetch to work with arbitrary requests

* typo: Fix missing handler closure

* miner, work_notify: use fetch and parity-reactor

* Fix work_notify pushing in parity CLI
This commit is contained in:
Wei Tang
2018-04-10 19:51:29 +08:00
committed by Marek Kotewicz
parent 86446d713a
commit 692cd10d4a
20 changed files with 302 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ethcore/src/miner/miner.rs
View File

@@ -36,7 +36,7 @@ use ethcore_miner::transaction_queue::{
TransactionOrigin,
};
use futures_cpupool::CpuPool;
use ethcore_miner::work_notify::{WorkPoster, NotifyWork};
use ethcore_miner::work_notify::NotifyWork;
use miner::service_transaction_checker::ServiceTransactionChecker;
use miner::{MinerService, MinerStatus};
use price_info::fetch::Client as FetchClient;
@@ -104,8 +104,6 @@ pub enum Banning {
/// Configures the behaviour of the miner.
#[derive(Debug, PartialEq)]
pub struct MinerOptions {
/// URLs to notify when there is new work.
pub new_work_notify: Vec<String>,
/// Force the miner to reseal, even when nobody has asked for work.
pub force_sealing: bool,
/// Reseal on receipt of new external transactions.
@@ -147,7 +145,6 @@ pub struct MinerOptions {
impl Default for MinerOptions {
fn default() -> Self {
MinerOptions {
new_work_notify: vec![],
force_sealing: false,
reseal_on_external_tx: false,
reseal_on_own_tx: true,
@@ -305,10 +302,7 @@ impl Miner {
),
};
let notifiers: Vec<Box<NotifyWork>> = match options.new_work_notify.is_empty() {
true => Vec::new(),
false => vec![Box::new(WorkPoster::new(&options.new_work_notify))],
};
let notifiers: Vec<Box<NotifyWork>> = Vec::new();
let service_transaction_action = match options.refuse_service_transactions {
true => ServiceTransactionAction::Refuse,
@@ -324,7 +318,6 @@ impl Miner {
sealing_work: Mutex::new(SealingWork{
queue: UsingQueue::new(options.work_queue_size),
enabled: options.force_sealing
|| !options.new_work_notify.is_empty()
|| spec.engine.seals_internally().is_some()
}),
gas_range_target: RwLock::new((U256::zero(), U256::zero())),
@@ -1364,7 +1357,6 @@ mod tests {
fn miner() -> Miner {
Arc::try_unwrap(Miner::new(
MinerOptions {
new_work_notify: Vec::new(),
force_sealing: false,
reseal_on_external_tx: false,
reseal_on_own_tx: true,