Full support of no_std in tendermint crate

informalsystems · Nov 23, 2021 · 89ceb7d · 89ceb7d
1 parent 9690eca
commit 89ceb7d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -30,10 +30,10 @@ crate-type = ["cdylib", "rlib"]
 [dependencies]
 tendermint = { version = "0.23.0", default-features = false, path = "../tendermint" }
 flex-error = { version = "0.4.4", default-features = false }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
-toml = { version = "0.5" }
-url = { version = "2.2" }
+serde = { version = "1", default-features = false, features = ["derive"] }
+serde_json = { version = "1", default-features = false }
+toml = { version = "0.5", default-features = false }
+url = { version = "2.2", default-features = false }
 
 [dev-dependencies]
-pretty_assertions = "0.7.2"
+pretty_assertions = { version = "0.7.2", default-features = false }
diff --git a/config/src/config.rs b/config/src/config.rs
@@ -8,9 +8,9 @@
 
 use crate::net;
 use crate::node_key::NodeKey;
+use crate::prelude::*;
 use crate::Error;
 
-use crate::prelude::*;
 use alloc::collections::{btree_map, BTreeMap};
 use core::{fmt, str::FromStr};
 use serde::{de, de::Error as _, ser, Deserialize, Serialize};

diff --git a/proto/src/lib.rs b/proto/src/lib.rs
@@ -8,6 +8,9 @@
 
 extern crate alloc;
 
+#[cfg(feature = "std")]
+extern crate std;
+
 mod prelude;
 
 /// Built-in prost_types with slight customization to enable JSON-encoding

diff --git a/proto/src/tendermint.rs b/proto/src/tendermint.rs
@@ -53,6 +53,7 @@ pub mod p2p {
 }
 
 pub mod abci {
+    use crate::prelude::*;
     include!("prost/tendermint.abci.rs");
 }
 

diff --git a/tendermint/Cargo.toml b/tendermint/Cargo.toml
@@ -29,9 +29,6 @@ authors = [
 all-features = true
 rustdoc-args = ["--cfg", "docsrs"]
 
-[lib]
-crate-type = ["cdylib", "rlib"]
-
 [dependencies]
 async-trait = { version = "0.1", default-features = false }
 bytes = { version = "1.0", default-features = false }