From 0ab9775561c21bfa385b04e29a91431407c18774 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Thu, 28 Apr 2016 21:48:13 +0200
Subject: [PATCH] Disabling wallet (#1017)

* Disabling wallet

* Fixing compilation
---
 Cargo.lock         | 10 +---------
 webapp/Cargo.toml  |  2 +-
 webapp/src/apps.rs |  1 +
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 86882b787..dedc91891 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -295,6 +295,7 @@ name = "ethcore-ipc-nano"
 version = "1.1.0"
 dependencies = [
  "ethcore-ipc 1.1.0",
+ "jsonrpc-core 2.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "nanomsg 0.5.0 (git+https://github.com/ethcore/nanomsg.rs.git)",
 ]
@@ -367,7 +368,6 @@ dependencies = [
  "jsonrpc-http-server 5.1.0 (git+https://github.com/debris/jsonrpc-http-server.git)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parity-status 0.2.2 (git+https://github.com/tomusdrw/parity-status.git)",
- "parity-wallet 0.1.1 (git+https://github.com/tomusdrw/parity-wallet.git)",
  "parity-webapp 0.1.0 (git+https://github.com/tomusdrw/parity-webapp.git)",
  "url 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -825,14 +825,6 @@ dependencies = [
  "parity-webapp 0.1.0 (git+https://github.com/tomusdrw/parity-webapp.git)",
 ]
 
-[[package]]
-name = "parity-wallet"
-version = "0.1.1"
-source = "git+https://github.com/tomusdrw/parity-wallet.git#a2148b6b3c4c25f3a70f6fee5bc60a082e0f2efa"
-dependencies = [
- "parity-webapp 0.1.0 (git+https://github.com/tomusdrw/parity-webapp.git)",
-]
-
 [[package]]
 name = "parity-webapp"
 version = "0.1.0"
diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml
index 0a469cae4..0bc371e91 100644
--- a/webapp/Cargo.toml
+++ b/webapp/Cargo.toml
@@ -22,5 +22,5 @@ parity-wallet = { git = "https://github.com/tomusdrw/parity-wallet.git", optiona
 clippy = { version = "0.0.63", optional = true}
 
 [features]
-default = ["parity-wallet"]
+default = []
 dev = ["clippy", "ethcore-rpc/dev", "ethcore-util/dev"]
diff --git a/webapp/src/apps.rs b/webapp/src/apps.rs
index 2f9d40e45..b0a4472f7 100644
--- a/webapp/src/apps.rs
+++ b/webapp/src/apps.rs
@@ -18,6 +18,7 @@ use endpoint::Endpoints;
 use page::PageEndpoint;
 
 extern crate parity_status;
+#[cfg(feature = "parity-wallet")]
 extern crate parity_wallet;