correction to comply with the latest version of libtransport

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "libtransport-tcp"
-version = "0.0.1"
+version = "0.0.2"
 authors = ["Samuel Marks <@SamuelMarks>"]
 edition = "2018"
 

src/lib.rs

@@ -132,7 +132,7 @@ impl<Id, Pe, Data: 'static, E, PL> Transport<Id, Data, E, PL> for TCPtransport<D
 where
     Data: Serialize + DeserializeOwned + Send + Clone,
     Id: PeerId,
-    Pe: Peer<Id>,
+    Pe: Peer<Id, E>,
     PL: PeerList<Id, E, P = Pe>,
 {
     /// Create a new TCPtransport struct and configure its values.
@@ -178,14 +178,36 @@ where
         Ok(())
     }
 
-    /// Send a message to all peers in a PeerList.
+    /// Send a message to all peers in a PeerList, on base address.
     /// Requires a PeerList and data struct.
     fn broadcast(&mut self, peers: &mut PL, data: Data) -> Result<()> {
         // Iterate over all peers
         for p in peers.iter() {
             //dbg!(p.get_net_addr());
             // Create a TCP stream to the current net address.
-            let mut stream = TcpStream::connect(p.get_net_addr())?;
+            let mut stream = TcpStream::connect(p.get_base_addr())?;
+            // Serialize data to a bytes.
+            let bytes = serialize(&data)?;
+            // Write bytes to the stream.
+            let sent = stream.write(&bytes)?;
+            // Check if sent data is same as the bytes initially made.
+            if sent != bytes.len() {
+                return Err(Error::Incomplete);
+            }
+            // Shut down the stream once the message has been sent.
+            stream.shutdown(std::net::Shutdown::Write)?;
+        }
+        Ok(())
+    }
+
+    /// Send a message to all peers in a PeerList, on base address.
+    /// Requires a PeerList and data struct.
+    fn broadcast_n(&mut self, peers: &mut PL, n: usize, data: Data) -> Result<()> {
+        // Iterate over all peers
+        for p in peers.iter() {
+            //dbg!(p.get_net_addr());
+            // Create a TCP stream to the current net address.
+            let mut stream = TcpStream::connect(p.get_net_addr(n))?;
             // Serialize data to a bytes.
             let bytes = serialize(&data)?;
             // Write bytes to the stream.

src/receiver.rs

@@ -38,7 +38,7 @@ impl<Id, Pe, Data: 'static, E, PL> TransportReceiver<Id, Data, E, PL> for TCPrec
 where
     Data: DeserializeOwned + Send + Clone,
     Id: PeerId,
-    Pe: Peer<Id>,
+    Pe: Peer<Id, E>,
     PL: PeerList<Id, E, P = Pe>,
 {
     /// Create a new TCPtransport struct and configure its values.

src/sender.rs

@@ -16,7 +16,7 @@ impl<Id, Pe, Data: 'static, E, PL> TransportSender<Id, Data, E, PL> for TCPsende
 where
     Data: Serialize + Send + Clone,
     Id: PeerId,
-    Pe: Peer<Id>,
+    Pe: Peer<Id, E>,
     PL: PeerList<Id, E, P = Pe>,
 {
     fn new() -> Result<Self> {
@@ -49,7 +49,28 @@ where
         for p in peers.iter() {
             //dbg!(p.get_net_addr());
             // Create a TCP stream to the current net address.
-            let mut stream = TcpStream::connect(p.get_net_addr())?;
+            let mut stream = TcpStream::connect(p.get_base_addr())?;
+            // Serialize data to a bytes.
+            let bytes = serialize(&data)?;
+            // Write bytes to the stream.
+            let sent = stream.write(&bytes)?;
+            // Check if sent data is same as the bytes initially made.
+            if sent != bytes.len() {
+                return Err(Error::Incomplete);
+            }
+            // Shut down the stream once the message has been sent.
+            stream.shutdown(std::net::Shutdown::Write)?;
+        }
+        Ok(())
+    }
+    /// Send a message to all peers in a PeerList, on base address.
+    /// Requires a PeerList and data struct.
+    fn broadcast_n(&mut self, peers: &mut PL, n: usize, data: Data) -> Result<()> {
+        // Iterate over all peers
+        for p in peers.iter() {
+            //dbg!(p.get_net_addr());
+            // Create a TCP stream to the current net address.
+            let mut stream = TcpStream::connect(p.get_net_addr(n))?;
             // Serialize data to a bytes.
             let bytes = serialize(&data)?;
             // Write bytes to the stream.