Fix merge mistakes

abci/Cargo.toml

@@ -32,11 +32,10 @@ std = [
 ]
 
 [dependencies]
-bytes = "1.0"
-prost = { package = "informalsystems-prost", version = "0.8.1" }
-tendermint-proto = { version = "0.22.0", path = "../proto" }
-tracing = "0.1"
-flex-error = { version = "0.4.1", default-features = false }
-
-structopt = { version = "0.3", optional = true }
-tracing-subscriber = { version = "0.2", optional = true }
+bytes = { version = "1.0", default-features = false }
+prost = { package = "informalsystems-prost", version = "0.8.1", default-features = false }
+tendermint-proto = { version = "0.22.0", default-features = false, path = "../proto" }
+tracing = { version = "0.1", default-features = false }
+flex-error = { version = "0.4.3", default-features = false }
+structopt = { version = "0.3", optional = true, default-features = false }
+tracing-subscriber = { version = "0.2", optional = true, default-features = false }

p2p/Cargo.toml

@@ -31,21 +31,21 @@ std = [
 ]
 
 [dependencies]
-chacha20poly1305 = "0.8"
-ed25519-dalek = "1"
-eyre = "0.6"
-flume = "0.10.7"
-hkdf = "0.10.0"
-merlin = "2"
-prost = { package = "informalsystems-prost", version = "0.8.1" }
-rand_core = { version = "0.5", features = ["std"] }
-sha2 = "0.9"
-subtle = "2"
-x25519-dalek = "1.1"
-zeroize = "1"
-signature = "1.3.0"
-aead = "0.4.1"
-flex-error = { version = "0.4.1", default-features = false }
+chacha20poly1305 = { version = "0.8", default-features = false, features = ["reduced-round"] }
+ed25519-dalek = { version = "1", default-features = false }
+eyre = { version = "0.6", default-features = false }
+flume = { version = "0.10.7", default-features = false }
+hkdf = { version = "0.10.0", default-features = false }
+merlin = { version = "2", default-features = false }
+prost = { package = "informalsystems-prost", version = "0.8.1", default-features = false }
+rand_core = { version = "0.5", default-features = false, features = ["std"] }
+sha2 = { version = "0.9", default-features = false }
+subtle = { version = "2", default-features = false }
+x25519-dalek = { version = "1.1", default-features = false }
+zeroize = { version = "1", default-features = false }
+signature = { version = "1.3.0", default-features = false }
+aead = { version = "0.4.1", default-features = false }
+flex-error = { version = "0.4.3", default-features = false }
 
 # path dependencies
 tendermint = { path = "../tendermint", version = "0.22.0" }

p2p/src/error.rs

@@ -1,6 +1,6 @@
 //! Error types
 
-use flex_error::{define_error, DisplayError, TraceError};
+use flex_error::{define_error, DisplayOnly};
 use prost::DecodeError;
 use signature::Error as SignatureError;
 
@@ -22,11 +22,11 @@ define_error! {
             | _ | { "malformed handshake message (protocol version mismatch?)" },
 
         Io
-            [ TraceError<std::io::Error> ]
+            [ DisplayOnly<std::io::Error> ]
             | _ | { "io error" },
 
         Decode
-            [ TraceError<DecodeError> ]
+            [ DisplayOnly<DecodeError> ]
             | _ | { "malformed handshake message (protocol version mismatch?)" },
 
         MissingSecret
@@ -36,14 +36,14 @@ define_error! {
             | _ | { "public key missing" },
 
         Signature
-            [ TraceError<SignatureError> ]
+            [ DisplayOnly<SignatureError> ]
             | _ | { "signature error" },
 
         UnsupportedKey
             | _ | { "secp256k1 is not supported" },
 
         Aead
-            [ DisplayError<aead::Error> ]
+            [ DisplayOnly<aead::Error> ]
             | _ | { "aead error" },
 
         ShortCiphertext

proto/Cargo.toml

@@ -17,16 +17,16 @@ description = """
 all-features = true
 
 [dependencies]
-prost = { package = "informalsystems-prost", version = "0.8.1" }
-prost-types = { package = "informalsystems-prost-types", version = "0.8.1" }
-bytes = "1.0"
-serde = { version = "1.0", features = ["derive"] }
-subtle-encoding = "0.5"
-serde_bytes = "0.11"
-num-traits = "0.2"
-num-derive = "0.3"
+prost = { package = "informalsystems-prost", version = "0.8.1", default-features = false }
+prost-types = { package = "informalsystems-prost-types", version = "0.8.1", default-features = false }
+bytes = { version = "1.0", default-features = false }
+serde = { version = "1.0", default-features = false, features = ["derive"] }
+serde_bytes = { version = "0.11", default-features = false, features = ["alloc"] }
+subtle-encoding = { version = "0.5", default-features = false, features = ["hex", "base64", "alloc"] }
+num-traits = { version = "0.2", default-features = false }
+num-derive = { version = "0.3", default-features = false }
 chrono = { version = "0.4", default-features = false, features = ["serde", "alloc"] }
-flex-error = { version = "0.4.1", default-features = false }
+flex-error = { version = "0.4.3", default-features = false }
 
 [dev-dependencies]
 serde_json = "1.0"

tendermint/Cargo.toml

@@ -33,31 +33,29 @@ rustdoc-args = ["--cfg", "docsrs"]
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
-async-trait = "0.1"
-bytes = "1.0"
-chrono = { version = "0.4.19", features = ["serde"] }
-ed25519 = "1"
-ed25519-dalek = { version = "1", features = ["serde"] }
-futures = "0.3"
-num-traits = "0.2"
-once_cell = "1.3"
-prost = { package = "informalsystems-prost", version = "0.8.1" }
-prost-types = { package = "informalsystems-prost-types", version = "0.8.1" }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-serde_bytes = "0.11"
-serde_repr = "0.1"
+async-trait = { version = "0.1", default-features = false }
+bytes = { version = "1.0", default-features = false }
+chrono = { version = "0.4.19", default-features = false, features = ["serde"] }
+ed25519 = { version = "1", default-features = false }
+ed25519-dalek = { version = "1", default-features = false, features = ["u64_backend"] }
+futures = { version = "0.3", default-features = false }
+num-traits = { version = "0.2", default-features = false }
+once_cell = { version = "1.3", default-features = false }
+prost = { package = "informalsystems-prost", version = "0.8.1", default-features = false }
+prost-types = { package = "informalsystems-prost-types", version = "0.8.1", default-features = false }
+serde = { version = "1", default-features = false, features = ["derive"] }
+serde_json = { version = "1", default-features = false, features = ["alloc"] }
+serde_bytes = { version = "0.11", default-features = false }
+serde_repr = { version = "0.1", default-features = false }
 sha2 = { version = "0.9", default-features = false }
-signature = "1.2"
-subtle = "2"
-subtle-encoding = { version = "0.5", features = ["bech32-preview"] }
-tendermint-proto = { version = "0.22.0", path = "../proto" }
-zeroize = { version = "1.1", features = ["zeroize_derive"] }
-flex-error = { version = "0.4.1", default-features = false }
-time = "0.1.40"
-
-k256 = { version = "0.9", optional = true, features = ["ecdsa"] }
-ripemd160 = { version = "0.9", optional = true }
+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.22.0", default-features = false, path = "../proto" }
+zeroize = { version = "1.1", default-features = false, features = ["zeroize_derive", "alloc"] }
+flex-error = { version = "0.4.3", default-features = false }
+k256 = { version = "0.9", optional = true, default-features = false, features = ["ecdsa", "sha256"] }
+ripemd160 = { version = "0.9", default-features = false, optional = true }
 
 [features]
 default = ["std", "eyre_tracer"]