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

* icarus -> update, increase web timeout. * Fix estimate gas
openethereum · Jan 13, 2017 · c2f4716 · c2f4716
1 parent 7611bbd
commit c2f4716
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/dapps/src/handlers/fetch.rs b/dapps/src/handlers/fetch.rs
@@ -34,7 +34,7 @@ use endpoint::EndpointPath;
 use handlers::{ContentHandler, StreamingHandler};
 use page::{LocalPageEndpoint, PageHandlerWaiting};
 
-const FETCH_TIMEOUT: u64 = 30;
+const FETCH_TIMEOUT: u64 = 300;
 
 pub enum ValidatorResponse {
 	Local(LocalPageEndpoint),

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