From aa6e171e063b7fe5c0c3a02c9aab6329db81588d Mon Sep 17 00:00:00 2001 From: Wei Tang Date: Tue, 26 Jun 2018 15:52:54 +0800 Subject: [PATCH 1/4] Use local parity-dapps-glue instead of crate published at crates.io --- Cargo.lock | 17 +---------------- dapps/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 74e15ededf2..494f9c084a9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2108,7 +2108,7 @@ dependencies = [ "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", "node-health 0.1.0", - "parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "parity-dapps-glue 1.9.1", "parity-hash-fetch 1.12.0", "parity-reactor 0.1.0", "parity-version 1.12.0", @@ -2137,20 +2137,6 @@ dependencies = [ "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "parity-dapps-glue" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "aster 0.41.0 (registry+https://github.com/rust-lang/crates.io-index)", - "glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "mime_guess 2.0.0-alpha.2 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.32.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.58.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "parity-hash-fetch" version = "1.12.0" @@ -3971,7 +3957,6 @@ dependencies = [ "checksum ordered-float 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "58d25b6c0e47b20d05226d288ff434940296e7e2f8b877975da32f862152241f" "checksum ordermap 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a86ed3f5f244b372d6b1a00b72ef7f8876d0bc6a78a4c9985c53614041512063" "checksum owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" -"checksum parity-dapps-glue 1.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "261c025c67ba416e9fe63aa9b3236520ce3c74cfbe43590c9cdcec4ccc8180e4" "checksum parity-tokio-ipc 0.1.5 (git+https://github.com/nikvolf/parity-tokio-ipc)" = "" "checksum parity-wasm 0.27.5 (registry+https://github.com/rust-lang/crates.io-index)" = "a93ad771f67ce8a6af64c6444a99c07b15f4674203657496fc31244ffb1de2c3" "checksum parity-wordlist 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d0dec124478845b142f68b446cbee953d14d4b41f1bc0425024417720dce693" diff --git a/dapps/Cargo.toml b/dapps/Cargo.toml index c3fd75ddc10..f16233b607c 100644 --- a/dapps/Cargo.toml +++ b/dapps/Cargo.toml @@ -13,7 +13,6 @@ futures = "0.1" futures-cpupool = "0.1" linked-hash-map = "0.5" log = "0.3" -parity-dapps-glue = "1.9" parking_lot = "0.5" mime_guess = "2.0.0-alpha.2" rand = "0.4" @@ -32,6 +31,7 @@ ethcore-bytes = { path = "../util/bytes" } ethereum-types = "0.3" fetch = { path = "../util/fetch" } node-health = { path = "./node-health" } +parity-dapps-glue = { path = "./js-glue" } parity-hash-fetch = { path = "../hash-fetch" } parity-reactor = { path = "../util/reactor" } keccak-hash = { path = "../util/hash" } From 3e30f9918d2617e1af24a651e8871764beaa1264 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 26 Jun 2018 13:49:56 +0300 Subject: [PATCH 2/4] Clean global cargo cache --- test.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/test.sh b/test.sh index 9e273c7492a..c2de1734d85 100755 --- a/test.sh +++ b/test.sh @@ -57,4 +57,5 @@ cd parity-clib-example && \ # Running tests echo "________Running Parity Full Test Suite________" git submodule update --init --recursive +rm -rf "$HOME/.cargo/registry/cache" cargo test -j 8 $OPTIONS --features "$FEATURES" --all $1 From f75ea20ff00d9901b61acb4eddbc33c36f9c791b Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 26 Jun 2018 14:17:41 +0300 Subject: [PATCH 3/4] s/cache/src --- test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test.sh b/test.sh index c2de1734d85..f0030574ab7 100755 --- a/test.sh +++ b/test.sh @@ -57,5 +57,5 @@ cd parity-clib-example && \ # Running tests echo "________Running Parity Full Test Suite________" git submodule update --init --recursive -rm -rf "$HOME/.cargo/registry/cache" +rm -rf "$HOME/.cargo/registry/src" cargo test -j 8 $OPTIONS --features "$FEATURES" --all $1 From 4237b20be48e71dd625b964c6317c925e26d5190 Mon Sep 17 00:00:00 2001 From: Andronik Ordian Date: Tue, 26 Jun 2018 14:54:30 +0300 Subject: [PATCH 4/4] if this doesn't help, I don't know what will --- test.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test.sh b/test.sh index f0030574ab7..cf363462d84 100755 --- a/test.sh +++ b/test.sh @@ -57,5 +57,7 @@ cd parity-clib-example && \ # Running tests echo "________Running Parity Full Test Suite________" git submodule update --init --recursive -rm -rf "$HOME/.cargo/registry/src" +rm -rf "$HOME/.cargo/registry" +rm -rf "$HOME/.cargo/git" +cargo clean cargo test -j 8 $OPTIONS --features "$FEATURES" --all $1