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

Address review grumble.

Browse Source
This commit is contained in:
Gav Wood 2016-07-09 16:59:15 +02:00
parent 172553c81e
commit 716de21873
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ethcore/src/miner/price_info.rs
View File

@ -41,11 +41,11 @@ impl<F: Fn(PriceInfo) + Sync + Send + 'static> Drop for SetPriceHandler<F> {
} }
impl<F: Fn(PriceInfo) + Sync + Send + 'static> Handler<HttpStream> for SetPriceHandler<F> { impl<F: Fn(PriceInfo) + Sync + Send + 'static> Handler<HttpStream> for SetPriceHandler<F> {
fn on_request(&mut self, _: &mut Request) -> Next { trace!(target: "miner", "price_info: on_request"); Next::read().timeout(Duration::from_secs(3)) } fn on_request(&mut self, _: &mut Request) -> Next { Next::read().timeout(Duration::from_secs(3)) }
fn on_request_writable(&mut self, _: &mut Encoder<HttpStream>) -> Next { trace!(target: "miner", "price_info: on_request_writable"); Next::read().timeout(Duration::from_secs(3)) } fn on_request_writable(&mut self, _: &mut Encoder<HttpStream>) -> Next { Next::read().timeout(Duration::from_secs(3)) }
fn on_response(&mut self, _: Response) -> Next { trace!(target: "miner", "price_info: on_response"); Next::read().timeout(Duration::from_secs(3)) } fn on_response(&mut self, _: Response) -> Next { Next::read().timeout(Duration::from_secs(3)) }
fn on_response_readable(&mut self, r: &mut Decoder<HttpStream>) -> Next { fn on_response_readable(&mut self, r: &mut Decoder<HttpStream>) -> Next {
trace!(target: "miner", "price_info: on_response_readable!");
let mut body = String::new(); let mut body = String::new();
let _ = r.read_to_string(&mut body).ok() let _ = r.read_to_string(&mut body).ok()
.and_then(|_| Json::from_str(&body).ok()) .and_then(|_| Json::from_str(&body).ok())
@ -65,9 +65,7 @@ impl PriceInfo {
pub fn get<F: Fn(PriceInfo) + Sync + Send + 'static>(set_price: F) -> Result<(), ()> { pub fn get<F: Fn(PriceInfo) + Sync + Send + 'static>(set_price: F) -> Result<(), ()> {
// TODO: Handle each error type properly // TODO: Handle each error type properly
let client = try!(Client::new().map_err(|_| ())); let client = try!(Client::new().map_err(|_| ()));
trace!(target: "miner", "Starting price info request...");
thread::spawn(move || { thread::spawn(move || {
trace!(target: "miner", "Inside thread...");
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
let _ = client.request(FromStr::from_str("http://api.etherscan.io/api?module=stats&action=ethprice").unwrap(), SetPriceHandler { let _ = client.request(FromStr::from_str("http://api.etherscan.io/api?module=stats&action=ethprice").unwrap(), SetPriceHandler {
set_price: set_price, set_price: set_price,
@ -88,7 +86,6 @@ fn should_get_price_info() {
init_log(); init_log();
let done = Arc::new((Mutex::new(PriceInfo { ethusd: 0f32 }), Condvar::new())); let done = Arc::new((Mutex::new(PriceInfo { ethusd: 0f32 }), Condvar::new()));
let rdone = done.clone(); let rdone = done.clone();
trace!(target: "miner", "price_info: getting price_info");
PriceInfo::get(move |price| { let mut p = rdone.0.lock().unwrap(); *p = price; rdone.1.notify_one(); }).unwrap(); PriceInfo::get(move |price| { let mut p = rdone.0.lock().unwrap(); *p = price; rdone.1.notify_one(); }).unwrap();
let p = done.1.wait_timeout(done.0.lock().unwrap(), Duration::from_millis(10000)).unwrap(); let p = done.1.wait_timeout(done.0.lock().unwrap(), Duration::from_millis(10000)).unwrap();
assert!(!p.1.timed_out()); assert!(!p.1.timed_out());

2
sync/src/lib.rs
View File

@ -46,7 +46,7 @@
//! let dir = env::temp_dir(); //! let dir = env::temp_dir();
//! let miner = Miner::new( //! let miner = Miner::new(
//! Default::default(), //! Default::default(),
//! GasPricer::new_fixed(20_000_000_000.into()), //! GasPricer::new_fixed(20_000_000_000u64.into()),
//! ethereum::new_frontier(), //! ethereum::new_frontier(),
//! None //! None
//! ); //! );