chore: move net2 dependency out of tendermint crate

CHANGES.md

@@ -21,6 +21,7 @@ RPC:
   - `abci_info`, `abci_query`, `block_results`, `genesis` structs
   - serialization/deserialization fixes
   - Updated/fixed integration tests
+- Move into its own crate ([#338](https://github.com/informalsystems/tendermint-rs/pull/338))
 
 CI:
 - Moved to GitHub Actions ([#120](https://github.com/informalsystems/tendermint-rs/issues/120))

Cargo.toml

@@ -1,7 +1,8 @@
 [workspace]
 
 members = [
-    "tendermint",
-    "light-node",
     "light-client",
+    "light-node",
+    "rpc",
+    "tendermint",
 ]

light-client/Cargo.toml

@@ -6,6 +6,7 @@ edition = "2018"
 
 [dependencies]
 tendermint = { path = "../tendermint" }
+tendermint-rpc = { version = "0.1.0", path = "../rpc" }
 
 anomaly = { version = "0.2.0", features = ["serializer"] }
 contracts = "0.4.0"

light-client/src/components/io.rs

@@ -6,9 +6,11 @@ use serde::{Deserialize, Serialize};
 use thiserror::Error;
 
 use tendermint::{
-    block::signed_header::SignedHeader as TMSignedHeader, rpc, validator::Set as TMValidatorSet,
+    block::signed_header::SignedHeader as TMSignedHeader, validator::Set as TMValidatorSet,
 };
 
+use tendermint_rpc as rpc;
+
 use crate::{
     bail,
     types::{Height, LightBlock, PeerId},

light-client/tests/light_client.rs

@@ -1,3 +1,13 @@
+use std::collections::HashMap;
+use std::convert::TryInto;
+use std::fs;
+use std::{
+    path::{Path, PathBuf},
+    time::{Duration, SystemTime},
+};
+
+use contracts::contract_trait;
+
 use tendermint_light_client::{
     components::{
         clock::Clock,
@@ -13,16 +23,7 @@ use tendermint_light_client::{
     types::{Height, LightBlock, PeerId, Time, TrustThreshold},
 };
 
-use std::collections::HashMap;
-use std::convert::TryInto;
-use std::fs;
-use std::{
-    path::{Path, PathBuf},
-    time::{Duration, SystemTime},
-};
-
-use contracts::contract_trait;
-use tendermint::rpc;
+use tendermint_rpc as rpc;
 
 // Link to the commit that generated below JSON test files:
 // https://github.com/Shivani912/tendermint/commit/e02f8fd54a278f0192353e54b84a027c8fe31c1e

light-node/Cargo.toml

@@ -1,16 +1,17 @@
 [package]
-name = "light_node"
+name = "tendermint-light-node"
 authors = ["Ethan Buchman <ethan@coinculture.info>", "Ismail Khoffi <Ismail.Khoffi@gmail.com>"]
 version = "0.1.0"
 edition = "2018"
 
 [dependencies]
+abscissa_tokio = "0.5"
+async-trait = "0.1"
 gumdrop = "0.7"
 serde = { version = "1", features = ["serde_derive"] }
 tendermint = { version = "0.13.0-dev", path = "../tendermint" }
-async-trait = "0.1"
+tendermint-rpc = { version = "0.1.0", path = "../rpc" }
 tokio = { version = "0.2", features = ["full"] }
-abscissa_tokio = "0.5"
 
 [dependencies.abscissa_core]
 version = "0.5.0"

light-node/src/bin/light_node/main.rs

@@ -3,7 +3,7 @@
 #![deny(warnings, missing_docs, trivial_casts, unused_qualifications)]
 #![forbid(unsafe_code)]
 
-use light_node::application::APPLICATION;
+use tendermint_light_node::application::APPLICATION;
 
 /// Boot LightNode
 fn main() {

light-node/src/commands/start.rs

@@ -2,23 +2,24 @@
 
 /// App-local prelude includes `app_reader()`/`app_writer()`/`app_config()`
 /// accessors along with logging macros. Customize as you see fit.
-use crate::prelude::*;
+use abscissa_core::{config, Command, FrameworkError, Options, Runnable};
+use std::process;
+use std::time::{Duration, SystemTime};
 
 use tendermint::hash;
 use tendermint::lite;
+use tendermint::lite::error::Error;
 use tendermint::lite::ValidatorSet as _;
 use tendermint::lite::{Header, Height, Requester, TrustThresholdFraction};
-use tendermint::rpc;
 use tendermint::Hash;
 
+use tendermint_rpc as rpc;
+
 use crate::application::APPLICATION;
 use crate::config::LightNodeConfig;
+use crate::prelude::*;
 use crate::requester::RPCRequester;
 use crate::store::{MemStore, State};
-use abscissa_core::{config, Command, FrameworkError, Options, Runnable};
-use std::process;
-use std::time::{Duration, SystemTime};
-use tendermint::lite::error::Error;
 
 /// `start` subcommand
 ///

light-node/src/requester.rs

@@ -3,11 +3,12 @@ use async_trait::async_trait;
 use tendermint::block::signed_header::SignedHeader as TMCommit;
 use tendermint::block::Header as TMHeader;
 use tendermint::lite::{error, Height, SignedHeader};
-use tendermint::rpc;
 use tendermint::validator;
 use tendermint::validator::Set;
 use tendermint::{block, lite};
 
+use tendermint_rpc as rpc;
+
 /// RPCRequester wraps the Tendermint rpc::Client.
 pub struct RPCRequester {
     client: rpc::Client,
@@ -50,11 +51,13 @@ impl lite::types::Requester<TMCommit, TMHeader> for RPCRequester {
 
 #[cfg(test)]
 mod tests {
-    use super::*;
     use tendermint::lite::types::Header as LiteHeader;
     use tendermint::lite::types::Requester as LiteRequester;
     use tendermint::lite::types::ValidatorSet as LiteValSet;
-    use tendermint::rpc;
+
+    use tendermint_rpc as rpc;
+
+    use super::*;
 
     // TODO: integration test
     #[tokio::test]

light-node/tests/acceptance.rs

@@ -19,9 +19,10 @@
 )]
 
 use abscissa_core::testing::prelude::*;
-use light_node::config::LightNodeConfig;
 use once_cell::sync::Lazy;
 
+use tendermint_light_node::config::LightNodeConfig;
+
 /// Executes your application binary via `cargo run`.
 ///
 /// Storing this value as a [`Lazy`] static ensures that all instances of
@@ -91,5 +92,5 @@ fn start_with_config_and_args() {
 fn version_no_args() {
     let mut runner = RUNNER.clone();
     let mut cmd = runner.arg("version").capture_stdout().run();
-    cmd.stdout().expect_regex(r"\A\w+ [\d\.\-]+\z");
+    cmd.stdout().expect_regex(r"\A[\w-]+ [\d\.\-]+\z");
 }

rpc/Cargo.toml

@@ -0,0 +1,20 @@
+[package]
+name = "tendermint-rpc"
+version = "0.1.0"
+authors = ["Alexander Simmerl <a.simmerl@gmail.com>"]
+edition = "2018"
+
+[dependencies]
+async-tungstenite = {version="0.5", features = ["tokio-runtime"]}
+bytes = "0.5"
+futures = "0.3"
+getrandom = "0.1"
+http = "0.2"
+hyper = "0.13"
+serde = { version = "1", features = [ "derive" ] }
+serde_bytes = "0.11"
+serde_json = "1"
+tendermint = { version = "0.13.0", path = "../tendermint" }
+thiserror = "1"
+tokio = { version = "0.2", features = ["macros"] }
+uuid = { version = "0.8", default-features = false }

tendermint/src/rpc/client.rs → rpc/src/client.rs

@@ -1,15 +1,15 @@
 //! Tendermint RPC client
 
-use crate::{
-    abci::{self, Transaction},
-    block::Height,
-    net,
-    rpc::{endpoint::*, Error, Request, Response},
-    Genesis,
-};
 use bytes::buf::ext::BufExt;
 use hyper::header;
 
+use tendermint::abci::{self, Transaction};
+use tendermint::block::Height;
+use tendermint::net;
+use tendermint::Genesis;
+
+use crate::{endpoint::*, Error, Request, Response};
+
 /// Tendermint RPC client.
 ///
 /// Presently supports JSONRPC via HTTP.

tendermint/src/rpc/endpoint/abci_info.rs → rpc/src/endpoint/abci_info.rs

@@ -1,18 +1,19 @@
 //! `/abci_info` endpoint JSONRPC wrapper
 
-use crate::serializers;
-use crate::{block, rpc};
 use serde::{Deserialize, Serialize};
 
+use tendermint::block;
+use tendermint::serializers;
+
 /// Request ABCI information from a node
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Request;
 
-impl rpc::Request for Request {
+impl crate::Request for Request {
     type Response = Response;
 
-    fn method(&self) -> rpc::Method {
-        rpc::Method::AbciInfo
+    fn method(&self) -> crate::Method {
+        crate::Method::AbciInfo
     }
 }
 
@@ -23,7 +24,7 @@ pub struct Response {
     pub response: AbciInfo,
 }
 
-impl rpc::Response for Response {}
+impl crate::Response for Response {}
 
 /// ABCI information
 #[derive(Clone, Debug, Deserialize, Serialize, Default)]

tendermint/src/rpc/endpoint/abci_query.rs → rpc/src/endpoint/abci_query.rs

@@ -1,13 +1,12 @@
 //! `/abci_query` endpoint JSONRPC wrapper
 
-use crate::{
-    abci::{Code, Log, Path},
-    block,
-    merkle::proof::Proof,
-    rpc, serializers,
-};
 use serde::{Deserialize, Serialize};
 
+use tendermint::abci::{Code, Log, Path};
+use tendermint::block;
+use tendermint::merkle::proof::Proof;
+use tendermint::serializers;
+
 /// Query the ABCI application for information
 #[derive(Clone, Debug, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Request {
@@ -42,11 +41,11 @@ impl Request {
     }
 }
 
-impl rpc::Request for Request {
+impl crate::Request for Request {
     type Response = Response;
 
-    fn method(&self) -> rpc::Method {
-        rpc::Method::AbciQuery
+    fn method(&self) -> crate::Method {
+        crate::Method::AbciQuery
     }
 }
 
@@ -57,7 +56,7 @@ pub struct Response {
     pub response: AbciQuery,
 }
 
-impl rpc::Response for Response {}
+impl crate::Response for Response {}
 
 /// ABCI query results
 #[derive(Clone, Debug, Deserialize, Serialize, Default)]

tendermint/src/rpc/endpoint/block.rs → rpc/src/endpoint/block.rs

@@ -1,11 +1,9 @@
 //! `/block` endpoint JSONRPC wrapper
 
-use crate::{
-    block::{self, Block},
-    rpc,
-};
 use serde::{Deserialize, Serialize};
 
+use tendermint::block::{self, Block};
+
 /// Get information about a specific block
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Request {
@@ -24,11 +22,11 @@ impl Request {
     }
 }
 
-impl rpc::Request for Request {
+impl crate::Request for Request {
     type Response = Response;
 
-    fn method(&self) -> rpc::Method {
-        rpc::Method::Block
+    fn method(&self) -> crate::Method {
+        crate::Method::Block
     }
 }
 
@@ -42,4 +40,4 @@ pub struct Response {
     pub block: Block,
 }
 
-impl rpc::Response for Response {}
+impl crate::Response for Response {}

tendermint/src/rpc/endpoint/block_results.rs → rpc/src/endpoint/block_results.rs

@@ -1,8 +1,9 @@
 //! `/block_results` endpoint JSONRPC wrapper
 
-use crate::{abci, block, consensus, rpc, validator};
 use serde::{Deserialize, Serialize};
 
+use tendermint::{abci, block, consensus, validator};
+
 /// Get ABCI results at a given height.
 #[derive(Clone, Debug, Default, Deserialize, Eq, PartialEq, Serialize)]
 pub struct Request {
@@ -21,11 +22,11 @@ impl Request {
     }
 }
 
-impl rpc::Request for Request {
+impl crate::Request for Request {
     type Response = Response;
 
-    fn method(&self) -> rpc::Method {
-        rpc::Method::BlockResults
+    fn method(&self) -> crate::Method {
+        crate::Method::BlockResults
     }
 }
 
@@ -52,4 +53,4 @@ pub struct Response {
     pub consensus_param_updates: Option<consensus::Params>,
 }
 
-impl rpc::Response for Response {}
+impl crate::Response for Response {}