net module reorg
This commit is contained in:
parent
d569f90f58
commit
e5da98b224
|
@ -3,7 +3,7 @@ use ser::{
|
|||
Stream, Serializable,
|
||||
Reader, Deserializable, Error as ReaderError, deserialize,
|
||||
};
|
||||
use {Port, IpAddress, ServiceFlags};
|
||||
use common::{Port, IpAddress, ServiceFlags};
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct NetAddress {
|
||||
|
@ -42,7 +42,7 @@ impl From<&'static str> for NetAddress {
|
|||
#[cfg(test)]
|
||||
mod tests {
|
||||
use ser::{serialize, deserialize};
|
||||
use ServiceFlags;
|
||||
use common::ServiceFlags;
|
||||
use super::NetAddress;
|
||||
|
||||
#[test]
|
|
@ -2,7 +2,7 @@ use std::{str, fmt};
|
|||
use std::ascii::AsciiExt;
|
||||
use hash::H96;
|
||||
use ser::{Serializable, Stream, Deserializable, Reader, Error as ReaderError};
|
||||
use Error;
|
||||
use common::Error;
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct Command(H96);
|
|
@ -0,0 +1,15 @@
|
|||
mod address;
|
||||
mod command;
|
||||
mod error;
|
||||
mod inventory;
|
||||
mod ip;
|
||||
mod port;
|
||||
mod service;
|
||||
|
||||
pub use self::address::NetAddress;
|
||||
pub use self::command::Command;
|
||||
pub use self::error::Error;
|
||||
pub use self::inventory::{InventoryVector, InventoryType};
|
||||
pub use self::ip::IpAddress;
|
||||
pub use self::port::Port;
|
||||
pub use self::service::ServiceFlags;
|
|
@ -3,28 +3,7 @@ extern crate bitcrypto as crypto;
|
|||
extern crate primitives;
|
||||
extern crate serialization as ser;
|
||||
|
||||
mod address;
|
||||
mod command;
|
||||
mod error;
|
||||
mod inventory;
|
||||
mod ip;
|
||||
mod message;
|
||||
mod message_header;
|
||||
mod payload;
|
||||
mod port;
|
||||
mod service;
|
||||
mod version;
|
||||
mod common;
|
||||
mod messages;
|
||||
|
||||
pub use primitives::{hash, bytes};
|
||||
|
||||
pub use self::address::NetAddress;
|
||||
pub use self::command::Command;
|
||||
pub use self::error::Error;
|
||||
pub use self::inventory::{InventoryVector, InventoryType};
|
||||
pub use self::ip::IpAddress;
|
||||
pub use self::message::Message;
|
||||
pub use self::message_header::MessageHeader;
|
||||
pub use self::payload::Payload;
|
||||
pub use self::port::Port;
|
||||
pub use self::service::ServiceFlags;
|
||||
pub use self::version::{Version, Simple, V106, V70001};
|
||||
|
|
|
@ -3,7 +3,7 @@ use ser::{
|
|||
Deserializable, Reader, Error as ReaderError,
|
||||
Serializable, Stream, serialize
|
||||
};
|
||||
use {MessageHeader, Payload};
|
||||
use messages::{MessageHeader, Payload};
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct Message {
|
||||
|
@ -59,7 +59,7 @@ impl Deserializable for Message {
|
|||
mod tests {
|
||||
use bytes::Bytes;
|
||||
use ser::{serialize, deserialize};
|
||||
use {Version, Payload};
|
||||
use messages::{Payload, Version};
|
||||
use super::Message;
|
||||
|
||||
#[test]
|
|
@ -3,7 +3,7 @@ use ser::{
|
|||
Serializable, Stream,
|
||||
Deserializable, Reader, Error as ReaderError
|
||||
};
|
||||
use Command;
|
||||
use common::Command;
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct MessageHeader {
|
|
@ -0,0 +1,9 @@
|
|||
mod message;
|
||||
mod message_header;
|
||||
mod payload;
|
||||
mod version;
|
||||
|
||||
pub use self::message::Message;
|
||||
pub use self::message_header::MessageHeader;
|
||||
pub use self::payload::Payload;
|
||||
pub use self::version::{Version, Simple, V106, V70001};
|
|
@ -2,7 +2,8 @@ use ser::{
|
|||
Serializable, Stream,
|
||||
Reader, Error as ReaderError
|
||||
};
|
||||
use {Version, Command};
|
||||
use common::Command;
|
||||
use messages::{Version};
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum Payload {
|
|
@ -3,7 +3,7 @@ use ser::{
|
|||
Serializable, Stream,
|
||||
Deserializable, Reader, Error as ReaderError, deserialize
|
||||
};
|
||||
use {ServiceFlags, NetAddress};
|
||||
use common::{NetAddress, ServiceFlags};
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub enum Version {
|
Loading…
Reference in New Issue