From b8b9235c4e4332ae167ff432ed1a8ba8fdf48e3c Mon Sep 17 00:00:00 2001 From: debris Date: Mon, 19 Sep 2016 16:13:50 +0200 Subject: [PATCH] net lib --- Cargo.lock | 11 +++++++++-- Cargo.toml | 4 +--- net/Cargo.toml | 10 ++++++++++ {src/net => net/src}/address.rs | 4 ++-- src/net/mod.rs => net/src/lib.rs | 3 +++ {src/net => net/src}/service.rs | 0 src/lib.rs | 9 +-------- 7 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 net/Cargo.toml rename {src/net => net/src}/address.rs (98%) rename src/net/mod.rs => net/src/lib.rs (66%) rename {src/net => net/src}/service.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index d1418d6f..375d6749 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,11 +3,10 @@ name = "pbtc" version = "0.1.0" dependencies = [ "bitcrypto 0.1.0", - "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "chain 0.1.0", "keys 0.1.0", + "net 0.1.0", "primitives 0.1.0", - "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", "script 0.1.0", "serialization 0.1.0", ] @@ -98,6 +97,14 @@ name = "libc" version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "net" +version = "0.1.0" +dependencies = [ + "byteorder 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serialization 0.1.0", +] + [[package]] name = "nodrop" version = "0.1.8" diff --git a/Cargo.toml b/Cargo.toml index d871bd38..f1efd785 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,12 +4,10 @@ version = "0.1.0" authors = ["debris "] [dependencies] -byteorder = "0.5" -rustc-serialize = "0.3" - bitcrypto = { path = "crypto" } chain = { path = "chain" } keys = { path = "keys" } +net = { path = "net" } primitives = { path = "primitives" } script = { path = "script" } serialization = { path = "serialization" } diff --git a/net/Cargo.toml b/net/Cargo.toml new file mode 100644 index 00000000..874e8438 --- /dev/null +++ b/net/Cargo.toml @@ -0,0 +1,10 @@ +[package] +name = "net" +version = "0.1.0" +authors = ["debris "] + +[dependencies] +byteorder = "0.5" + +serialization = { path = "../serialization" } + diff --git a/src/net/address.rs b/net/src/address.rs similarity index 98% rename from src/net/address.rs rename to net/src/address.rs index e058ffd8..ddbd32f8 100644 --- a/src/net/address.rs +++ b/net/src/address.rs @@ -4,7 +4,7 @@ use ser::{ Stream, Serializable, Reader, Deserializable, Error as ReaderError }; -use net::ServiceFlags; +use ServiceFlags; #[derive(Debug, PartialEq)] pub struct Port(u16); @@ -120,7 +120,7 @@ impl Deserializable for NetAddress { #[cfg(test)] mod tests { use ser::{serialize, deserialize}; - use net::ServiceFlags; + use ServiceFlags; use super::NetAddress; #[test] diff --git a/src/net/mod.rs b/net/src/lib.rs similarity index 66% rename from src/net/mod.rs rename to net/src/lib.rs index 77eb90dd..a35de128 100644 --- a/src/net/mod.rs +++ b/net/src/lib.rs @@ -1,3 +1,6 @@ +extern crate byteorder; +extern crate serialization as ser; + mod address; mod service; diff --git a/src/net/service.rs b/net/src/service.rs similarity index 100% rename from src/net/service.rs rename to net/src/service.rs diff --git a/src/lib.rs b/src/lib.rs index 1ab75e3c..29c60222 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -10,17 +10,10 @@ //! serialization(primitives) //! primitives -extern crate byteorder; -extern crate rustc_serialize; - extern crate bitcrypto as crypto; extern crate chain; extern crate keys; +extern crate net; extern crate primitives; extern crate script; extern crate serialization as ser; - -pub mod net; - -pub use rustc_serialize::hex; -pub use primitives::{hash, bytes};