enable tendermint no_std and error handle by flex-error

.gitignore

@@ -23,3 +23,6 @@ light-client-js/pkg/
 light-client-js/examples/verifier-web/node_modules/
 light-client-js/examples/verifier-web/dist/
 light-client-js/examples/verifier-web/package-lock.json
+
+# clion
+.idea

p2p/Cargo.toml

@@ -19,6 +19,7 @@ description = """
 chacha20poly1305 = "0.7"
 ed25519-dalek = "1"
 eyre = "0.6"
+anyhow = "1.0"
 flume = "0.10"
 hkdf = "0.10.0"
 merlin = "2"
@@ -30,7 +31,6 @@ subtle-encoding = { version = "0.5" }
 thiserror = "1"
 x25519-dalek = "1.1"
 zeroize = "1"
-
 # path dependencies
 tendermint = { path = "../tendermint", version = "0.19.0" }
 tendermint-proto = { path = "../proto", version = "0.19.0" }

p2p/src/secret_connection/public_key.rs

@@ -4,7 +4,7 @@ use ed25519_dalek as ed25519;
 use sha2::{digest::Digest, Sha256};
 use std::fmt::{self, Display};
 use tendermint::{
-    error::{self, Error},
+    error::{self, KindError as Error},
     node,
 };
 
@@ -20,7 +20,7 @@ impl PublicKey {
     pub fn from_raw_ed25519(bytes: &[u8]) -> Result<PublicKey, Error> {
         ed25519::PublicKey::from_bytes(bytes)
             .map(PublicKey::Ed25519)
-            .map_err(|_| error::Kind::Crypto.into())
+            .map_err(|_| error::crypto_error())
     }
 
     /// Get Ed25519 public key

rpc/src/endpoint/abci_info.rs

@@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize};
 
 use std::convert::{TryFrom, TryInto};
 use tendermint::block;
-use tendermint::Error;
+use tendermint::error::Error;
 use tendermint_proto::abci::ResponseInfo;
 
 /// Request ABCI information from a node

tendermint/Cargo.toml

@@ -33,36 +33,65 @@ rustdoc-args = ["--cfg", "docsrs"]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-anomaly = "0.2"
+anyhow = {version = "1.0", default-features = false}
+flex-error = { version = "0.2.0", default-features = false, features = ["anyhow_tracer"]}
 async-trait = "0.1"
-bytes = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
-ed25519 = "1"
-ed25519-dalek = { version = "1", features = ["serde"] }
-futures = "0.3"
-num-traits = "0.2"
-once_cell = "1.3"
-prost = "0.7"
-prost-types = "0.7"
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-serde_bytes = "0.11"
+bytes = { version = "1.0", default-features = false }
+chrono = { version = "0.4", default-features = false, features = ["serde", "clock"] }
+ed25519 = { version = "1", default-features = false }
+# use features (u64 backend)
+ed25519-dalek = { version = "1", default-features = false, features = ["serde", "u64_backend"] }
+# TODO(thane): Remove once https://github.com/myrrlyn/funty/issues/3 is fixed
+funty = { version = "=1.1.0", default-features = false }
+futures = { version = "0.3", default-features =  false }
+num-traits = { version = "0.2", default-features = false }
+once_cell = { version = "1.3", default-features = false }
+prost = { version = "0.7", default-features = false }
+prost-types = { version = "0.7", default-features = false }
+serde = { version = "1", default-features = false, features = ["derive"] }
+# use features (alloc)
+serde_json = { version = "1", default-features = false, features = ["alloc"] }
+serde_bytes = { version = "0.11", default-features = false }
 serde_repr = "0.1"
 sha2 = { version = "0.9", default-features = false }
-signature = "1.2"
-subtle = "2"
-subtle-encoding = { version = "0.5", features = ["bech32-preview"] }
-thiserror = "1"
+signature = { version = "1.2", default-features = false }
+subtle = { version = "2", default-features = false }
+subtle-encoding = { version = "0.5", default-features = false, features = ["bech32-preview"] }
 tendermint-proto = { version = "0.19.0", path = "../proto" }
 toml = { version = "0.5" }
 url = { version = "2.2" }
-zeroize = { version = "1.1", features = ["zeroize_derive"] }
-
-k256 = { version = "0.8", optional = true, features = ["ecdsa"] }
-ripemd160 = { version = "0.9", optional = true }
+zeroize = { version = "1.1", default-features = false, features = ["zeroize_derive", "alloc"] }
+k256 = { version = "0.7", default-features = false, optional = true, features = ["ecdsa"] }
+ripemd160 = { version = "0.9", default-features = false, optional = true }
+no-std-compat = { version = "0.4.1", features = [ "alloc" ] }
+displaydoc = {version = "0.2", default-features = false }
 
 [features]
 secp256k1 = ["k256", "ripemd160"]
+default = ["std"]
+std = [
+    'bytes/std',
+    'chrono/std',
+    'ed25519-dalek/std',
+    'funty/std',
+    'futures/std',
+    'num-traits/std',
+    'once_cell/std',
+    'prost/std',
+    'serde/std',
+    'serde_json/std',
+    'serde_bytes/std',
+    'sha2/std',
+    'signature/std',
+    'subtle/std',
+    'subtle-encoding/std',
+    'k256/std',
+    'ripemd160/std',
+    'no-std-compat/std',
+    'flex-error/std',
+    'anyhow/std',
+    'displaydoc/std',
+]
 
 [dev-dependencies]
 proptest = "0.10.1"

tendermint/src/abci/data.rs

@@ -1,4 +1,5 @@
 use serde::{Deserialize, Serialize};
+use std::vec::Vec;
 
 /// ABCI transaction data.
 ///

tendermint/src/abci/gas.rs

@@ -5,8 +5,10 @@
 //!
 //! <https://tendermint.com/docs/spec/abci/apps.html#gas>
 
-use crate::{Error, Kind};
+use crate::error::{self, KindError as Error};
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
+use std::prelude::v1::format;
+use std::string::{String, ToString};
 use std::{
     fmt::{self, Display},
     str::FromStr,
@@ -44,8 +46,10 @@ impl Display for Gas {
 impl FromStr for Gas {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
-        Ok(Self::from(s.parse::<u64>().map_err(|_| Kind::Parse)?))
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Ok(Self::from(s.parse::<u64>().map_err(|e| {
+            error::parse_int_error("Gas decode error".into(), e)
+        })?))
     }
 }
 

tendermint/src/abci/info.rs

@@ -1,5 +1,6 @@
 use serde::{Deserialize, Serialize};
 use std::fmt::{self, Display};
+use std::string::String;
 
 /// ABCI info
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]

tendermint/src/abci/log.rs

@@ -1,6 +1,7 @@
 use serde::{Deserialize, Serialize};
-use std::fmt;
-use std::fmt::Display;
+use std::borrow::ToOwned;
+use std::fmt::{self, Display};
+use std::string::String;
 
 /// ABCI log data
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]

tendermint/src/abci/path.rs

@@ -1,8 +1,10 @@
 //! Paths to ABCI data
 
-use crate::error::Error;
+use crate::error::KindError as Error;
 use serde::{Deserialize, Serialize};
+use std::string::String;
 use std::{
+    borrow::ToOwned,
     fmt::{self, Display},
     str::FromStr,
 };
@@ -20,7 +22,7 @@ impl Display for Path {
 impl FromStr for Path {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(Path(s.to_owned()))
     }
 }

tendermint/src/abci/responses.rs

@@ -3,7 +3,11 @@
 use super::{code::Code, data::Data, gas::Gas, info::Info, log::Log, tag::Tag};
 use crate::{consensus, serializers, validator};
 use serde::{Deserialize, Deserializer, Serialize};
-use std::fmt::{self, Display};
+use std::string::String;
+use std::{
+    fmt::{self, Display},
+    vec::Vec,
+};
 
 /// Responses for ABCI calls which occur during block processing.
 ///

tendermint/src/abci/tag.rs

@@ -1,7 +1,8 @@
 //! Tags
 
-use crate::error::Error;
+use crate::error::KindError as Error;
 use serde::{Deserialize, Serialize};
+use std::string::String;
 use std::{fmt, str::FromStr};
 use tendermint_proto::serializers::bytes::base64string;
 
@@ -34,7 +35,7 @@ impl AsRef<str> for Key {
 impl FromStr for Key {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(Key(s.into()))
     }
 }
@@ -64,7 +65,7 @@ impl AsRef<str> for Value {
 impl FromStr for Value {
     type Err = Error;
 
-    fn from_str(s: &str) -> Result<Self, Error> {
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
         Ok(Value(s.into()))
     }
 }

tendermint/src/abci/transaction.rs

@@ -4,6 +4,9 @@ mod hash;
 
 pub use self::hash::Hash;
 use serde::{de::Error as _, Deserialize, Deserializer, Serialize, Serializer};
+use std::prelude::v1::format;
+use std::prelude::v1::*;
+use std::string::String;
 use std::{fmt, slice};
 use subtle_encoding::base64;
 use tendermint_proto::types::Data as RawData;

tendermint/src/abci/transaction/hash.rs

@@ -1,11 +1,16 @@
 //! Transaction hashes
 
-use crate::error::{Error, Kind};
+use crate::error::{self, KindError as Error};
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+
 use std::{
     fmt::{self, Debug, Display},
     str::FromStr,
 };
+
+use std::prelude::v1::format;
+use std::string::{String, ToString};
+
 use subtle::{self, ConstantTimeEq};
 use subtle_encoding::hex;
 
@@ -64,10 +69,10 @@ impl FromStr for Hash {
         // Accept either upper or lower case hex
         let bytes = hex::decode_upper(s)
             .or_else(|_| hex::decode(s))
-            .map_err(|_| Kind::Parse.context("hash decode"))?;
+            .map_err(|_| error::parse_error("hash decode error".into()))?;
 
         if bytes.len() != LENGTH {
-            return Err(Kind::Parse.context("hash length").into());
+            return Err(error::parse_error("hash length error".into()));
         }
 
         let mut result_bytes = [0u8; LENGTH];

tendermint/src/account.rs

@@ -1,9 +1,7 @@
 //! Tendermint accounts
 
-use crate::{
-    error::{Error, Kind},
-    public_key::Ed25519,
-};
+use crate::error::{self, KindError as Error};
+use crate::public_key::Ed25519;
 
 use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
 use sha2::{Digest, Sha256};
@@ -20,6 +18,9 @@ use crate::public_key::Secp256k1;
 #[cfg(feature = "secp256k1")]
 use ripemd160::Ripemd160;
 use std::convert::TryFrom;
+use std::prelude::v1::format;
+use std::string::String;
+use std::vec::Vec;
 use tendermint_proto::Protobuf;
 
 /// Size of an  account ID in bytes
@@ -36,7 +37,7 @@ impl TryFrom<Vec<u8>> for Id {
 
     fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
         if value.len() != LENGTH {
-            return Err(Kind::InvalidAccountIdLength.into());
+            return Err(error::invalid_account_id_length_error());
         }
         let mut slice: [u8; LENGTH] = [0; LENGTH];
         slice.copy_from_slice(&value[..]);
@@ -118,7 +119,7 @@ impl FromStr for Id {
         // Accept either upper or lower case hex
         let bytes = hex::decode_upper(s)
             .or_else(|_| hex::decode(s))
-            .map_err(|_| Kind::Parse.context("account id decode"))?;
+            .map_err(|_| error::parse_error("id decode".into()))?;
 
         bytes.try_into()
     }