dae5d75dd6
* cargo upgrade "ethereum-types" --all --allow-prerelease * [ethash] fix compilation errors * [ethkey] fix compilation errors * [journaldb] fix compilation errors * [dir] fix compilation errors * [ethabi] update to 0.7 * wip * [eip-712] fix compilation errors * [ethjson] fix compilation errors * [Cargo.toml] add TODO to remove patches * [ethstore] fix compilation errors * use patched keccak-hash with new primitive-types * wip * [ethcore-network-devp2p] fix compilation errors * [vm] fix compilation errors * [common-types, evm, wasm] fix compilation errors * [ethcore-db] Require AsRef instead of Deref for keys * [ethcore-blockchain] fix some compilation errors * [blooms-db] fix compilation errors Thanks a lot @dvdplm :) * we don't need no rlp ethereum feature * [ethcore] fix some compilation errors * [parity-ipfs-api] fix compilation error * [ethcore-light] fix compilation errors * [Cargo.lock] update parity-common * [ethcore-private-tx] fix some compilation errors * wip * [ethcore-private-tx] fix compilation errors * [parity-updater] fix compilation errors * [parity-rpc] fix compilation errors * [parity-bin] fix other compilation errors * update to new ethereum-types * update keccak-hash * [fastmap] fix compilation in tests * [blooms-db] fix compilation in tests * [common-types] fix compilation in tests * [triehash-ethereum] fix compilation in tests * [ethkey] fix compilation in tests * [pwasm-run-test] fix compilation errors * [wasm] fix compilation errors * [ethjson] fix compilation in tests * [eip-712] fix compilation in tests * [ethcore-blockchain] fix compilation in tests * [ethstore] fix compilation in tests * [ethstore-accounts] fix compilation in tests * [parity-hash-fetch] fix compilation in tests * [parity-whisper] fix compilation in tests * [ethcore-miner] fix compilation in tests * [ethcore-network-devp2p] fix compilation in tests * [*] upgrade rand to 0.6 * [evm] get rid of num-bigint conversions * [ethcore] downgrade trie-standardmap and criterion * [ethcore] fix some warnings * [ethcore] fix compilation in tests * [evmbin] fix compilation in tests * [updater] fix compilation in tests * [ethash] fix compilation in tests * [ethcore-secretstore] fix compilation in tests * [ethcore-sync] fix compilation in tests * [parity-rpc] fix compilation in tests * [ethcore] finally fix compilation in tests FUCK YEAH!!! * [ethstore] lazy_static is unused * [ethcore] fix test * fix up bad merge * [Cargo.toml] remove unused patches * [*] replace some git dependencies with crates.io * [Cargo.toml] remove unused lazy_static * [*] clean up * [ethcore] fix transaction_filter_deprecated test * [private-tx] fix serialization tests * fix more serialization tests * [ethkey] fix smoky test * [rpc] fix tests, please? * [ethcore] remove commented out code * Apply suggestions from code review Co-Authored-By: Tomasz Drwięga <tomusdrw@users.noreply.github.com> * [ethstore] remove unused dev-dependency * [ethcore] remove resolved TODO * [*] resolve keccak-hash TODO * [*] s/Address::default()/Address::zero() * [rpc] remove Subscribers::new_test * [rpc] remove EthPubSubClient::new_test * [ethcore] use trie-standardmap from crates.io * [dir] fix db_root_path * [ethcore] simplify snapshot::tests::helpers::fill_storage * Apply suggestions from code review Co-Authored-By: David <dvdplm@gmail.com> * [ethcore-secretstore] resolve TODO in serialization * [ethcore-network-devp2p] resolve TODO in save_key * [Cargo.lock] update triehash * [*] use ethabi from crates.io * [ethkey] use secp256k1 from master branch * [Cargo.lock] update eth-secp256k1
113 lines
3.0 KiB
Rust
113 lines
3.0 KiB
Rust
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
|
|
// This file is part of Parity Ethereum.
|
|
|
|
// Parity Ethereum is free software: you can redistribute it and/or modify
|
|
// it under the terms of the GNU General Public License as published by
|
|
// the Free Software Foundation, either version 3 of the License, or
|
|
// (at your option) any later version.
|
|
|
|
// Parity Ethereum is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
// GNU General Public License for more details.
|
|
|
|
// You should have received a copy of the GNU General Public License
|
|
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
//! External Miner hashrate tracker.
|
|
|
|
use std::collections::HashMap;
|
|
use std::sync::Arc;
|
|
use std::time::{Instant, Duration};
|
|
use ethereum_types::{H256, U256};
|
|
use parking_lot::Mutex;
|
|
|
|
/// External miner interface.
|
|
pub trait ExternalMinerService: Send + Sync {
|
|
/// Submit hashrate for given miner.
|
|
fn submit_hashrate(&self, hashrate: U256, id: H256);
|
|
|
|
/// Total hashrate.
|
|
fn hashrate(&self) -> U256;
|
|
}
|
|
|
|
/// External Miner.
|
|
pub struct ExternalMiner {
|
|
hashrates: Arc<Mutex<HashMap<H256, (Instant, U256)>>>,
|
|
}
|
|
|
|
impl Default for ExternalMiner {
|
|
fn default() -> Self {
|
|
ExternalMiner {
|
|
hashrates: Arc::new(Mutex::new(HashMap::new())),
|
|
}
|
|
}
|
|
}
|
|
|
|
impl ExternalMiner {
|
|
/// Creates new external miner with prefilled hashrates.
|
|
pub fn new(hashrates: Arc<Mutex<HashMap<H256, (Instant, U256)>>>) -> Self {
|
|
ExternalMiner {
|
|
hashrates: hashrates,
|
|
}
|
|
}
|
|
}
|
|
|
|
const ENTRY_TIMEOUT: Duration = Duration::from_secs(2);
|
|
|
|
impl ExternalMinerService for ExternalMiner {
|
|
fn submit_hashrate(&self, hashrate: U256, id: H256) {
|
|
self.hashrates.lock().insert(id, (Instant::now() + ENTRY_TIMEOUT, hashrate));
|
|
}
|
|
|
|
fn hashrate(&self) -> U256 {
|
|
let mut hashrates = self.hashrates.lock();
|
|
let h = hashrates.drain().filter(|&(_, (t, _))| t > Instant::now()).collect();
|
|
*hashrates = h;
|
|
hashrates.iter().fold(U256::from(0), |sum, (_, &(_, v))| sum + v)
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use std::thread::sleep;
|
|
use std::time::Duration;
|
|
use ethereum_types::{H256, U256};
|
|
|
|
fn miner() -> ExternalMiner {
|
|
ExternalMiner::default()
|
|
}
|
|
|
|
#[test]
|
|
fn it_should_forget_old_hashrates() {
|
|
// given
|
|
let m = miner();
|
|
assert_eq!(m.hashrate(), U256::from(0));
|
|
m.submit_hashrate(U256::from(10), H256::from_low_u64_be(1));
|
|
assert_eq!(m.hashrate(), U256::from(10));
|
|
|
|
// when
|
|
sleep(Duration::from_secs(3));
|
|
|
|
// then
|
|
assert_eq!(m.hashrate(), U256::from(0));
|
|
}
|
|
|
|
#[test]
|
|
fn should_sum_up_hashrate() {
|
|
// given
|
|
let m = miner();
|
|
assert_eq!(m.hashrate(), U256::from(0));
|
|
m.submit_hashrate(U256::from(10), H256::from_low_u64_be(1));
|
|
assert_eq!(m.hashrate(), U256::from(10));
|
|
|
|
// when
|
|
m.submit_hashrate(U256::from(15), H256::from_low_u64_be(1));
|
|
m.submit_hashrate(U256::from(20), H256::from_low_u64_be(2));
|
|
|
|
// then
|
|
assert_eq!(m.hashrate(), U256::from(35));
|
|
}
|
|
}
|