Merge branch 'master' into dp/chore/switch-to-new-parity-crypto

* master: Remove support for hardware wallets (#10678) [CI] allow cargo audit to fail (#10676)
openethereum · May 21, 2019 · 02eff51 · 02eff51
2 parents b7235cb + 10c121a
commit 02eff51
Show file tree

Hide file tree

Showing 26 changed files with 17 additions and 1,844 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -93,6 +93,7 @@ cargo-audit:
   <<:                              *docker-cache-status
   script:
     - cargo audit
+  allow_failure:                   true # failed cargo audit shouldn't prevent a PR from being merged
 
 validate-chainspecs:
   stage:                           test

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/README.md b/README.md
@@ -36,7 +36,7 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
   $ curl https://sh.rustup.rs -sSf | sh
   ```
 
-  Parity Ethereum also requires `gcc`, `g++`, `libudev-dev`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
+  Parity Ethereum also requires `gcc`, `g++`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
 
 - OSX:
   ```bash

diff --git a/accounts/Cargo.toml b/accounts/Cargo.toml
@@ -17,12 +17,6 @@ serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 
-[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows"))'.dependencies]
-hardware-wallet = { path = "hw" }
-
-[target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows")))'.dependencies]
-fake-hardware-wallet = { path = "fake-hardware-wallet" }
-
 [dev-dependencies]
 ethereum-types = "0.4"
 tempdir = "0.3"
diff --git a/accounts/fake-hardware-wallet/Cargo.toml b/accounts/fake-hardware-wallet/Cargo.toml
diff --git a/accounts/fake-hardware-wallet/src/lib.rs b/accounts/fake-hardware-wallet/src/lib.rs
diff --git a/accounts/hw/Cargo.toml b/accounts/hw/Cargo.toml