diff --git a/dapps/src/handlers/fetch.rs b/dapps/src/handlers/fetch.rs index 7634f1941..c3e668733 100644 --- 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 index 20841b1fd..037106804 100644 --- 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) };