Merge pull request #228 from tendermint/tendermint-rs/updates-and-cle…

…anups

tendermint-rs: Fixes, cleanups, and updates

.circleci/config.yml

@@ -26,6 +26,7 @@ jobs:
           cargo build --features=yubihsm
           cargo build --features=ledgertm
           cargo build --features=yubihsm,ledgertm,softsign
+          cd tendermint-rs && cargo build --no-default-features
     - run:
         name: build --release
         command: |

Cargo.toml

@@ -42,7 +42,7 @@ signatory-dalek = "0.11"
 signatory-secp256k1 = "0.11"
 subtle = "2"
 subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
-tendermint = { version = "0.5.0-alpha1", path = "tendermint-rs" }
+tendermint = { version = "0.5", path = "tendermint-rs", features = ["amino-types", "secret-connection"] }
 tiny-bip39 = "0.6"
 wait-timeout = "0.2"
 yubihsm = { version = "0.22", features = ["setup", "usb"], optional = true }

src/client.rs

@@ -6,7 +6,7 @@
 //! as a "Key Management System".
 
 use crate::{
-    config::{ValidatorAddr, ValidatorConfig},
+    config::ValidatorConfig,
     error::{KmsError, KmsErrorKind},
     keyring::SecretKeyEncoding,
     session::Session,
@@ -21,7 +21,7 @@ use std::{
     thread::{self, JoinHandle},
     time::Duration,
 };
-use tendermint::{chain, secret_connection};
+use tendermint::{chain, node, secret_connection, Address};
 
 /// How long to wait after a crash before respawning (in seconds)
 pub const RESPAWN_DELAY: u64 = 1;
@@ -68,7 +68,7 @@ fn client_loop(config: ValidatorConfig, should_term: &Arc<AtomicBool>) {
         }
 
         let session_result = match &addr {
-            ValidatorAddr::Tcp {
+            Address::Tcp {
                 peer_id,
                 host,
                 port,
@@ -82,7 +82,7 @@ fn client_loop(config: ValidatorConfig, should_term: &Arc<AtomicBool>) {
                     return;
                 }
             },
-            ValidatorAddr::Unix { socket_path } => unix_session(chain_id, socket_path, should_term),
+            Address::Unix { path } => unix_session(chain_id, path, should_term),
         };
 
         if let Err(e) = session_result {
@@ -107,7 +107,7 @@ fn client_loop(config: ValidatorConfig, should_term: &Arc<AtomicBool>) {
 /// Create a TCP connection to a validator (encrypted with SecretConnection)
 fn tcp_session(
     chain_id: chain::Id,
-    validator_peer_id: Option<secret_connection::PeerId>,
+    validator_peer_id: Option<node::Id>,
     host: &str,
     port: u16,
     secret_key_path: &Path,

src/config/validator/mod.rs → src/config/validator.rs

@@ -1,15 +1,11 @@
-mod addr;
-
 use std::path::PathBuf;
-use tendermint::chain;
-
-pub use self::addr::ValidatorAddr;
+use tendermint::{chain, Address};
 
 /// Validator configuration
 #[derive(Clone, Deserialize, Debug)]
 pub struct ValidatorConfig {
     /// Address of the validator (`tcp://` or `unix://`)
-    pub addr: ValidatorAddr,
+    pub addr: Address,
 
     /// Chain ID of the Tendermint network this validator is part of
     pub chain_id: chain::Id,

src/error.rs

@@ -9,8 +9,7 @@ use std::{
     fmt::{self, Display},
     io,
 };
-use tendermint;
-use tendermint::amino_types::validate::ValidationError as TmValidationError;
+use tendermint::amino_types::validate::ValidationError;
 
 /// Error type
 #[derive(Debug)]
@@ -142,7 +141,7 @@ impl From<signatory::Error> for KmsError {
 }
 
 impl From<tendermint::Error> for KmsError {
-    fn from(other: tendermint::Error) -> Self {
+    fn from(other: tendermint::error::Error) -> Self {
         let kind = match other {
             tendermint::Error::Crypto => KmsErrorKind::CryptoError,
             tendermint::Error::InvalidKey => KmsErrorKind::InvalidKey,
@@ -158,8 +157,8 @@ impl From<tendermint::Error> for KmsError {
     }
 }
 
-impl From<TmValidationError> for KmsError {
-    fn from(other: TmValidationError) -> Self {
+impl From<ValidationError> for KmsError {
+    fn from(other: ValidationError) -> Self {
         err!(KmsErrorKind::InvalidMessageError, other).into()
     }
 }

src/session.rs

@@ -24,7 +24,8 @@ use std::{
 };
 use subtle::ConstantTimeEq;
 use tendermint::{
-    amino_types::{PingRequest, PingResponse, PubKeyRequest},
+    amino_types::{PingRequest, PingResponse, PubKeyRequest, PubKeyResponse},
+    node,
     secret_connection::{self, SecretConnection},
 };
 
@@ -41,7 +42,7 @@ impl Session<SecretConnection<TcpStream>> {
     /// Create a new session with the validator at the given address/port
     pub fn connect_tcp(
         chain_id: chain::Id,
-        validator_peer_id: Option<secret_connection::PeerId>,
+        validator_peer_id: Option<node::Id>,
         host: &str,
         port: u16,
         secret_connection_key: &ed25519::Seed,
@@ -170,8 +171,8 @@ where
 
     /// Get the public key for (the only) public key in the keyring
     fn get_public_key(&mut self, _request: &PubKeyRequest) -> Result<Response, KmsError> {
-        Ok(Response::PublicKey(
-            KeyRing::default_pubkey()?.to_response(),
-        ))
+        Ok(Response::PublicKey(PubKeyResponse::from(
+            *KeyRing::default_pubkey()?,
+        )))
     }
 }

tendermint-rs/Cargo.toml

@@ -32,37 +32,37 @@ bytes = "0.4"
 chrono = { version = "0.4", features = ["serde"] }
 digest = "0.8"
 failure = "0.1"
-failure_derive = "0.1"
 hkdf = { version = "0.7", optional = true }
 prost-amino = { version = "0.4.0", optional = true }
 prost-amino-derive = { version = "0.4.0", optional = true }
 rand_os = { version = "0.1", optional = true }
 ring = { version = "0.14", optional = true }
-serde = { version = "1", optional = true }
-serde_derive = { version =  "1", optional = true }
-signatory = { version = "0.11.2", optional = true, features = ["ed25519", "ecdsa"] }
+serde = { version = "1", optional = true, features = ["derive"] }
+signatory = { version = "0.11.2", features = ["ed25519", "ecdsa"] }
 signatory-dalek = { version = "0.11", optional = true }
-sha2 = { version = "0.8", optional = true, default-features = false }
-subtle = { version = "2", optional = true }
+sha2 = { version = "0.8", default-features = false }
+subtle = "2"
 subtle-encoding = { version = "0.3", features = ["bech32-preview"] }
 tai64 = { version = "1", optional = true, features = ["chrono"] }
-x25519-dalek = { version = "0.4.4", optional = true, default-features = false, features = ["u64_backend"] }
-zeroize = { version = "0.5.2", optional = true }
+x25519-dalek = { version = "0.5", optional = true, default-features = false, features = ["u64_backend"] }
+zeroize = { version = "0.6", optional = true }
+
+[dev-dependencies]
+serde_json = "1"
 
 [features]
-default = ["secret-connection", "serializers", "tai64"]
+default = ["serde", "tai64"]
+amino-types = ["prost-amino", "prost-amino-derive"]
 secret-connection = [
+    "amino-types",
     "byteorder",
     "hkdf",
-    "prost-amino",
-    "prost-amino-derive",
     "rand_os",
     "ring",
-    "signatory",
     "signatory-dalek",
-    "sha2",
-    "subtle",
     "x25519-dalek",
     "zeroize"
 ]
-serializers = ["serde", "serde_derive"]
+
+[package.metadata.docs.rs]
+all-features = true