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

icarus -> update, increase web timeout. (#4165)

Browse Source 
* icarus -> update, increase web timeout.

* Fix estimate gas
This commit is contained in:
Gav Wood 2017-01-13 15:30:16 +00:00 committed by Arkadiy Paronyan
parent 7611bbd3ee
commit c2f4716ee2
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dapps/src/handlers/fetch.rs
View File

@ -34,7 +34,7 @@ use endpoint::EndpointPath;
use handlers::{ContentHandler, StreamingHandler}; use handlers::{ContentHandler, StreamingHandler};
use page::{LocalPageEndpoint, PageHandlerWaiting}; use page::{LocalPageEndpoint, PageHandlerWaiting};
const FETCH_TIMEOUT: u64 = 30; const FETCH_TIMEOUT: u64 = 300;
pub enum ValidatorResponse { pub enum ValidatorResponse {
Local(LocalPageEndpoint), Local(LocalPageEndpoint),

2
ethcore/src/client/client.rs
View File

@ -903,7 +903,7 @@ impl BlockChainClient for Client {
Executive::new(&mut state, &env_info, &*self.engine, &self.factories.vm) Executive::new(&mut state, &env_info, &*self.engine, &self.factories.vm)
.transact(&tx, options.clone()) .transact(&tx, options.clone())
.map(|r| r.exception.is_some()) .map(|r| r.exception.is_none())
.unwrap_or(false) .unwrap_or(false)
}; };