removed additional_params method (#10818)

This commit is contained in:
Marek Kotewicz
2019-06-29 15:31:15 +08:00
committed by David
parent c1b3d5fe1a
commit 8fc504eb1a
9 changed files with 10 additions and 48 deletions

View File

@@ -16,7 +16,6 @@
use std::cmp;
use std::collections::{HashSet, BTreeMap, VecDeque};
use std::str::FromStr;
use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
use std::sync::{Arc, Weak};
use std::time::{Instant, Duration};
@@ -753,7 +752,7 @@ impl Client {
let importer = Importer::new(&config, engine.clone(), message_channel.clone(), miner)?;
let registrar_address = engine.additional_params().get("registrar").and_then(|s| Address::from_str(s).ok());
let registrar_address = engine.machine().params().registrar;
if let Some(ref addr) = registrar_address {
trace!(target: "client", "Found registrar at {}", addr);
}
@@ -1982,10 +1981,6 @@ impl BlockChainClient for Client {
self.importer.block_queue.clear();
}
fn additional_params(&self) -> BTreeMap<String, String> {
self.engine.additional_params().into_iter().collect()
}
fn logs(&self, filter: Filter) -> Result<Vec<LocalizedLogEntry>, BlockId> {
let chain = self.chain.read();

View File

@@ -841,10 +841,6 @@ impl BlockChainClient for TestBlockChainClient {
fn clear_queue(&self) {
}
fn additional_params(&self) -> BTreeMap<String, String> {
Default::default()
}
fn filter_traces(&self, _filter: TraceFilter) -> Option<Vec<LocalizedTrace>> {
self.traces.read().clone()
}

View File

@@ -296,9 +296,6 @@ pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContra
/// Clear block queue and abort all import activity.
fn clear_queue(&self);
/// Get the registrar address, if it exists.
fn additional_params(&self) -> BTreeMap<String, String>;
/// Returns logs matching given filter. If one of the filtering block cannot be found, returns the block id that caused the error.
fn logs(&self, filter: Filter) -> Result<Vec<LocalizedLogEntry>, BlockId>;