From ca0d87da1006eeb920b0bb02b2a6e744c0e94e6b Mon Sep 17 00:00:00 2001
From: Gav Wood <gavin@ethcore.io>
Date: Thu, 15 Dec 2016 22:05:54 +0100
Subject: [PATCH] 125 -> 69.

---
 Cargo.lock                   | 11 -----------
 ethcore/src/client/client.rs |  1 +
 ethcore/src/client/traits.rs |  2 +-
 js/src/api/format/output.js  |  3 ++-
 parity/cli/usage.txt         |  2 +-
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6b402ae78..f86b37a14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1409,17 +1409,6 @@ dependencies = [
  "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
-[[package]]
-name = "parking_lot"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.16 (registry+https://github.com/rust-lang/crates.io-index)",
- "smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "parking_lot"
 version = "0.3.6"
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 972960c73..bd1cc85cc 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -933,6 +933,7 @@ impl BlockChainClient for Client {
 	fn disable(&self) {
 		self.set_mode(IpcMode::Off);
 		self.enabled.store(false, AtomicOrdering::Relaxed);
+		self.clear_queue();
 	}
 
 	fn set_mode(&self, new_mode: IpcMode) {
diff --git a/ethcore/src/client/traits.rs b/ethcore/src/client/traits.rs
index b062990a0..407ecac28 100644
--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -265,7 +265,7 @@ pub trait BlockChainClient : Sync + Send {
 	/// Returns engine-related extra info for `BlockId`.
 	fn block_extra_info(&self, id: BlockId) -> Option<BTreeMap<String, String>>;
 
-	/// Returns engine-related extra info for `UncleID`.
+	/// Returns engine-related extra info for `UncleId`.
 	fn uncle_extra_info(&self, id: UncleId) -> Option<BTreeMap<String, String>>;
 
 	/// Returns information about pruning/data availability.
diff --git a/js/src/api/format/output.js b/js/src/api/format/output.js
index 632ab6f28..2fb684450 100644
--- a/js/src/api/format/output.js
+++ b/js/src/api/format/output.js
@@ -110,7 +110,8 @@ export function outPeers (peers) {
   return {
     active: outNumber(peers.active),
     connected: outNumber(peers.connected),
-    max: outNumber(peers.max)
+    max: outNumber(peers.max),
+    peers: peers.peers.map(p => { Object.keys(p.protocols).forEach(k => p.protocols[k].difficulty = outNumber(p.protocols[k].difficulty)); return p; })
   };
 }
 
diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt
index baf898ad8..29d652989 100644
--- a/parity/cli/usage.txt
+++ b/parity/cli/usage.txt
@@ -361,7 +361,7 @@ Legacy Options:
   --cache MB               Equivalent to --cache-size MB.
 
 Internal Options:
-  --can-restart            Executable will auto-restart if exiting with 125.  
+  --can-restart            Executable will auto-restart if exiting with 69.  
 
 Miscellaneous Options:
   -c --config CONFIG       Specify a filename containing a configuration file.