Move comit transport to cnd/

Author: Tobin C. Harding

Cargo.lock

@@ -36,6 +36,7 @@ hyper = "0.12"
 lazy_static = "1"
 libp2p = { version = "0.13" }
 libp2p-comit = { path = "../libp2p-comit" }
+libp2p-core = "0.13"
 libsqlite3-sys = { version = ">=0.8.0, <0.13.0", features = ["bundled"] }
 log = { version = "0.4", features = ["serde"] }
 maplit = "1"

cnd/Cargo.toml

@@ -8,7 +8,7 @@ use cnd::{
     db::{DetermineTypes, Retrieve, Saver, Sqlite},
     http_api::{self, route_factory},
     load_swaps,
-    network::{self, Network, SendRequest},
+    network::{self, transport, Network, SendRequest},
     seed::{Seed, SwapSeed},
     swap_protocols::{
         rfc003::{
@@ -24,7 +24,6 @@ use libp2p::{
     identity::{self, ed25519},
     PeerId, Swarm,
 };
-use libp2p_comit;
 use rand::rngs::OsRng;
 use std::{
     net::SocketAddr,
@@ -85,7 +84,7 @@ fn main() -> anyhow::Result<()> {
         .compat(),
     )?;
 
-    let transport = libp2p_comit::build_comit_transport(local_key_pair);
+    let transport = transport::build_comit_transport(local_key_pair);
     let behaviour = network::ComitNode::new(
         ledger_events.clone(),
         Arc::clone(&state_store),

cnd/src/main.rs

@@ -1,4 +1,5 @@
 pub mod send_request;
+pub mod transport;
 
 pub use send_request::*;
 

cnd/src/network/mod.rs

@@ -9,7 +9,6 @@ description = "Implementation of the COMIT messaging protocol"
 bytes = "0.4"
 derivative = "1.0.3"
 futures = "0.1"
-libp2p = "0.13"
 libp2p-core = "0.13"
 libp2p-swarm = "0.3"
 log = "0.4"

libp2p-comit/src/transport.rs renamed to cnd/src/network/transport.rs

@@ -9,7 +9,6 @@ mod protocol;
 mod substream;
 #[cfg(test)]
 pub mod test_harness;
-mod transport;
 
 use serde::{Deserialize, Serialize};
 use serde_json::{self, Value as JsonValue};
@@ -18,7 +17,6 @@ pub use self::{
     behaviour::{BehaviourOutEvent, Comit},
     handler::{ComitHandler, PendingInboundRequest, PendingOutboundRequest},
     protocol::{ComitProtocolConfig, Frames},
-    transport::build_comit_transport,
 };
 use crate::handler::{ProtocolOutEvent, ProtocolOutboundOpenInfo};
 use libp2p_swarm::ProtocolsHandlerEvent;