From e1251ff92c0c52f4f6103e9ee4e3939fd3f9cd0d Mon Sep 17 00:00:00 2001 From: Gav Date: Fri, 13 Jan 2017 12:24:25 +0000 Subject: [PATCH 1/2] icarus -> update, increase web timeout. --- .gitlab-ci.yml | 2 +- dapps/src/handlers/fetch.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2833a46c383..42c54d6be46 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -238,7 +238,7 @@ linux-arm: - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/parity.md5 --body parity.md5 - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb" --body "parity_"$VER"_armhf.deb" - aws s3api put-object --bucket $S3_BUCKET --key $CI_BUILD_REF_NAME/$PLATFORM/"parity_"$VER"_armhf.deb.md5" --body "parity_"$VER"_armhf.deb.md5" - - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://icarus.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM + - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1337/push-build/$CI_BUILD_REF_NAME/$PLATFORM - curl --data "commit=$CI_BUILD_REF&sha3=$SHA3&filename=parity&secret=$RELEASES_SECRET" http://update.parity.io:1338/push-build/$CI_BUILD_REF_NAME/$PLATFORM tags: - rust diff --git a/dapps/src/handlers/fetch.rs b/dapps/src/handlers/fetch.rs index 7634f194108..c3e66873355 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), From 43aa906758d47ec6b951c2876c6c2963b3e21286 Mon Sep 17 00:00:00 2001 From: Gav Date: Fri, 13 Jan 2017 12:57:35 +0000 Subject: [PATCH 2/2] Fix estimate gas --- ethcore/src/client/client.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs index 20841b1fd4b..037106804b8 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) };