Bump error-chain (#245)

* Bump error-chain * Fix compilation errors
paritytech · Jun 25, 2018 · 238b941 · 238b941
1 parent e50bb08
commit 238b941
Show file tree

Hide file tree

Showing 18 changed files with 108 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ version = "0.2.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
 polkadot-cli = { path = "polkadot/cli" }
 
 [workspace]

diff --git a/demo/cli/Cargo.toml b/demo/cli/Cargo.toml
@@ -10,7 +10,7 @@ ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 ed25519 = { path = "../../substrate/ed25519" }
 env_logger = "0.4"
 futures = "0.1.17"
-error-chain = "0.11"
+error-chain = "0.12"
 hex-literal = "0.1"
 log = "0.3"
 tokio-core = "0.1.12"

diff --git a/polkadot/api/Cargo.toml b/polkadot/api/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
 polkadot-executor = { path = "../executor" }
 polkadot-runtime = { path = "../runtime" }
 polkadot-primitives = { path = "../primitives" }

diff --git a/polkadot/cli/Cargo.toml b/polkadot/cli/Cargo.toml
@@ -7,7 +7,7 @@ description = "Polkadot node implementation in Rust."
 [dependencies]
 clap = { version = "2.27", features = ["yaml"] }
 env_logger = "0.4"
-error-chain = "0.11"
+error-chain = "0.12"
 log = "0.3"
 atty = "0.2"
 regex = "0.2"

diff --git a/polkadot/consensus/Cargo.toml b/polkadot/consensus/Cargo.toml
@@ -8,7 +8,7 @@ futures = "0.1.17"
 parking_lot = "0.4"
 tokio-core = "0.1.12"
 ed25519 = { path = "../../substrate/ed25519" }
-error-chain = "0.11"
+error-chain = "0.12"
 log = "0.3"
 exit-future = "0.1"
 polkadot-api = { path = "../api" }

diff --git a/polkadot/parachain/Cargo.toml b/polkadot/parachain/Cargo.toml
@@ -7,7 +7,7 @@ description = "Types and utilities for creating and working with parachains"
 [dependencies]
 substrate-codec = { path = "../../substrate/codec", default-features = false }
 wasmi = { version = "0.1", optional = true }
-error-chain = { version = "0.11", optional = true }
+error-chain = { version = "0.12", optional = true }
 
 [dev-dependencies]
 tiny-keccak = "1.4"

diff --git a/polkadot/service/Cargo.toml b/polkadot/service/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <[email protected]>"]
 futures = "0.1.17"
 parking_lot = "0.4"
 tokio-timer = "0.1.2"
-error-chain = "0.11"
+error-chain = "0.12"
 lazy_static = "1.0"
 log = "0.3"
 slog = "^2"

diff --git a/polkadot/transaction-pool/Cargo.toml b/polkadot/transaction-pool/Cargo.toml
@@ -5,7 +5,7 @@ authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
 log = "0.3.0"
-error-chain = "0.11"
+error-chain = "0.12"
 parking_lot = "0.4"
 polkadot-api = { path = "../api" }
 polkadot-primitives = { path = "../primitives" }

diff --git a/substrate/bft/Cargo.toml b/substrate/bft/Cargo.toml
@@ -12,7 +12,7 @@ substrate-runtime-primitives = { path = "../runtime/primitives" }
 ed25519 = { path = "../ed25519" }
 tokio-timer = "0.1.2"
 parking_lot = "0.4"
-error-chain = "0.11"
+error-chain = "0.12"
 log = "0.3"
 
 [dev-dependencies]

diff --git a/substrate/client/Cargo.toml b/substrate/client/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
 log = "0.3"
 parking_lot = "0.4"
 triehash = "0.1"

diff --git a/substrate/executor/Cargo.toml b/substrate/executor/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
 substrate-codec = { path = "../codec" }
 substrate-runtime-io = { path = "../runtime-io" }
 substrate-primitives = { path = "../primitives" }

diff --git a/substrate/extrinsic-pool/Cargo.toml b/substrate/extrinsic-pool/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
 futures = "0.1"
 log = "0.3"
 parking_lot = "0.4"

diff --git a/substrate/keystore/Cargo.toml b/substrate/keystore/Cargo.toml
@@ -6,7 +6,7 @@ authors = ["Parity Technologies <[email protected]>"]
 [dependencies]
 ethcore-crypto = { git = "https://github.com/paritytech/parity.git", default_features = false }
 ed25519 = { path = "../ed25519" }
-error-chain = "0.11"
+error-chain = "0.12"
 hex = "0.3"
 rand = "0.4"
 serde_json = "1.0"

diff --git a/substrate/keystore/src/lib.rs b/substrate/keystore/src/lib.rs
@@ -84,7 +84,7 @@ impl EncryptedKey {
 
 		// two parts of derived key
 		// DK = [ DK[0..15] DK[16..31] ] = [derived_left_bits, derived_right_bits]
-		let (derived_left_bits, derived_right_bits) = crypto::derive_key_iterations(password, &salt, iterations);
+		let (derived_left_bits, derived_right_bits) = crypto::derive_key_iterations(password.as_bytes(), &salt, iterations);
 
 		// preallocated (on-stack in case of `Secret`) buffer to hold cipher
 		// length = length(plain) as we are using CTR-approach
@@ -108,7 +108,7 @@ impl EncryptedKey {
 
 	fn decrypt(&self, password: &str) -> Result<[u8; PKCS_LEN]> {
 		let (derived_left_bits, derived_right_bits) =
-			crypto::derive_key_iterations(password, &self.salt, self.iterations);
+			crypto::derive_key_iterations(password.as_bytes(), &self.salt, self.iterations);
 
 		let mac = crypto::derive_mac(&derived_right_bits, &self.ciphertext).keccak256();
 

diff --git a/substrate/network/Cargo.toml b/substrate/network/Cargo.toml
@@ -11,7 +11,7 @@ authors = ["Parity Technologies <[email protected]>"]
 log = "0.3"
 rand = "0.3"
 parking_lot = "0.4"
-error-chain = "0.11"
+error-chain = "0.12"
 bitflags = "1.0"
 serde = "1.0"
 serde_derive = "1.0"

diff --git a/substrate/network/src/service.rs b/substrate/network/src/service.rs
@@ -19,7 +19,7 @@ use std::sync::Arc;
 use std::io;
 use std::time::Duration;
 use futures::sync::{oneshot, mpsc};
-use network::{NetworkProtocolHandler, NetworkContext, HostInfo, PeerId, ProtocolId,
+use network::{NetworkProtocolHandler, NetworkContext, PeerId, ProtocolId,
 NetworkConfiguration , NonReservedPeerMode, ErrorKind};
 use network_devp2p::{NetworkService};
 use core_io::{TimerToken};
@@ -175,9 +175,9 @@ impl<B: BlockT + 'static> Service<B> where B::Header: HeaderT<Number=u64> {
 	}
 
 	fn start(&self) {
-		match self.network.start().map_err(Into::into) {
+		match self.network.start().map_err(|e| e.0.into()) {
 			Err(ErrorKind::Io(ref e)) if  e.kind() == io::ErrorKind::AddrInUse =>
-				warn!("Network port {:?} is already in use, make sure that another instance of Polkadot client is not running or change the port using the --port option.", self.network.config().listen_address.expect("Listen address is not set.")),
+				warn!("Network port is already in use, make sure that another instance of Polkadot client is not running or change the port using the --port option."),
 			Err(err) => warn!("Error starting network: {}", err),
 			_ => {},
 		};
@@ -257,7 +257,7 @@ impl<B: BlockT + 'static> ConsensusService<B> for Service<B> where B::Header: He
 }
 
 impl<B: BlockT + 'static> NetworkProtocolHandler for ProtocolHandler<B> where B::Header: HeaderT<Number=u64> {
-	fn initialize(&self, io: &NetworkContext, _host_info: &HostInfo) {
+	fn initialize(&self, io: &NetworkContext) {
 		io.register_timer(TICK_TOKEN, TICK_TIMEOUT)
 			.expect("Error registering sync timer");
 

diff --git a/substrate/rpc/Cargo.toml b/substrate/rpc/Cargo.toml
@@ -4,7 +4,7 @@ version = "0.1.0"
 authors = ["Parity Technologies <[email protected]>"]
 
 [dependencies]
-error-chain = "0.11"
+error-chain = "0.12"
 jsonrpc-core = { git="https://github.com/paritytech/jsonrpc.git" }
 jsonrpc-macros = { git="https://github.com/paritytech/jsonrpc.git" }
 jsonrpc-pubsub = { git="https://github.com/paritytech/jsonrpc.git" }