grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

125 -> 69.

Browse Source
This commit is contained in:
Gav Wood 2016-12-15 22:05:54 +01:00
parent 5bab14e0c0
commit ca0d87da10
No known key found for this signature in database
GPG Key ID: C49C1ACA1CC9B252
5 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Cargo.lock generated
View File

@ -1409,17 +1409,6 @@ dependencies = [
"winapi 0.2.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.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]] [[package]]
name = "parking_lot" name = "parking_lot"
version = "0.3.6" version = "0.3.6"

1
ethcore/src/client/client.rs
View File

@ -933,6 +933,7 @@ impl BlockChainClient for Client {
fn disable(&self) { fn disable(&self) {
self.set_mode(IpcMode::Off); self.set_mode(IpcMode::Off);
self.enabled.store(false, AtomicOrdering::Relaxed); self.enabled.store(false, AtomicOrdering::Relaxed);
self.clear_queue();
} }
fn set_mode(&self, new_mode: IpcMode) { fn set_mode(&self, new_mode: IpcMode) {

2
ethcore/src/client/traits.rs
View File

@ -265,7 +265,7 @@ pub trait BlockChainClient : Sync + Send {
/// Returns engine-related extra info for `BlockId`. /// Returns engine-related extra info for `BlockId`.
fn block_extra_info(&self, id: BlockId) -> Option<BTreeMap<String, String>>; 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>>; fn uncle_extra_info(&self, id: UncleId) -> Option<BTreeMap<String, String>>;
/// Returns information about pruning/data availability. /// Returns information about pruning/data availability.

3
js/src/api/format/output.js
View File

@ -110,7 +110,8 @@ export function outPeers (peers) {
return { return {
active: outNumber(peers.active), active: outNumber(peers.active),
connected: outNumber(peers.connected), 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; })
}; };
} }

2
parity/cli/usage.txt
View File

@ -361,7 +361,7 @@ Legacy Options:
--cache MB Equivalent to --cache-size MB. --cache MB Equivalent to --cache-size MB.
Internal Options: Internal Options:
--can-restart Executable will auto-restart if exiting with 125. --can-restart Executable will auto-restart if exiting with 69.
Miscellaneous Options: Miscellaneous Options:
-c --config CONFIG Specify a filename containing a configuration file. -c --config CONFIG Specify a filename containing a configuration file.