Merge latest changes from master

Signed-off-by: Thane Thomson <[email protected]>
informalsystems · Feb 16, 2021 · a7c7a1b · a7c7a1b
2 parents d5f9488 + 9e39e1e
commit a7c7a1b
Show file tree

Hide file tree

Showing 3 changed files with 241 additions and 62 deletions.
diff --git a/p2p/Cargo.toml b/p2p/Cargo.toml
@@ -38,5 +38,8 @@ tendermint-proto = { path = "../proto", version = "0.18.1" }
 prost-amino = { version = "0.6", optional = true }
 prost-amino-derive = { version = "0.6", optional = true }
 
+[dev-dependencies]
+pipe = { version = "0", features = ["bidirectional"] }
+
 [features]
 amino = ["prost-amino", "prost-amino-derive"]