chore: merge conflict

chainbound · Jan 3, 2024 · 13ca179 · 13ca179
1 parent 298bfeb
commit 13ca179
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 36 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/msg-socket/src/pub/mod.rs b/msg-socket/src/pub/mod.rs
@@ -169,11 +169,7 @@ mod tests {
 
     use futures::StreamExt;
     use msg_transport::tcp::{self, Tcp};
-<<<<<<< HEAD
     use msg_wire::compression::GzipCompressor;
-=======
-    use msg_wire::compression::{GzipCompressor, GzipDecompressor};
->>>>>>> a8e78dad9e9360fd342641ffbad86a2f4ef7faae
 
     use crate::{SubOptions, SubSocket};
 
@@ -250,19 +246,10 @@ mod tests {
             PubSocket::<Tcp>::new(Tcp::default()).with_compressor(GzipCompressor::new(6));
 
         let mut sub1 =
-<<<<<<< HEAD
             SubSocket::<Tcp>::new(Tcp::new(tcp::Config::default().blocking_connect(true)));
 
         let mut sub2 =
             SubSocket::<Tcp>::new(Tcp::new(tcp::Config::default().blocking_connect(true)));
-=======
-            SubSocket::<Tcp>::new(Tcp::new(tcp::Config::default().blocking_connect(true)))
-                .with_decompressor(GzipDecompressor::new());
-
-        let mut sub2 =
-            SubSocket::<Tcp>::new(Tcp::new(tcp::Config::default().blocking_connect(true)))
-                .with_decompressor(GzipDecompressor::new());
->>>>>>> a8e78dad9e9360fd342641ffbad86a2f4ef7faae
 
         pub_socket.bind("0.0.0.0:0".parse().unwrap()).await.unwrap();
         let addr = pub_socket.local_addr().unwrap();

diff --git a/msg-socket/src/sub/driver.rs b/msg-socket/src/sub/driver.rs
@@ -19,10 +19,6 @@ use super::{
 };
 use msg_common::unix_micros;
 use msg_transport::Transport;
-<<<<<<< HEAD
-=======
-use msg_wire::compression::Decompressor;
->>>>>>> a8e78dad9e9360fd342641ffbad86a2f4ef7faae
 use msg_wire::pubsub;
 
 type ConnectionResult<Io, E> = Result<(SocketAddr, Io), E>;

diff --git a/msg/examples/pubsub_compression.rs b/msg/examples/pubsub_compression.rs
@@ -5,11 +5,7 @@ use tokio_stream::StreamExt;
 use tracing::Instrument;
 
 use msg::{
-<<<<<<< HEAD
     compression::GzipCompressor,
-=======
-    compression::{GzipCompressor, GzipDecompressor},
->>>>>>> a8e78dad9e9360fd342641ffbad86a2f4ef7faae
     tcp::{self, Tcp},
     PubSocket, SubSocket,
 };
@@ -26,25 +22,13 @@ async fn main() {
     let mut sub1 = SubSocket::new(
         // TCP transport with blocking connect, usually connection happens in the background.
         Tcp::new(tcp::Config::default().blocking_connect(true)),
-<<<<<<< HEAD
     );
-=======
-    )
-    // Enable Gzip decompression
-    .with_decompressor(GzipDecompressor::new());
->>>>>>> a8e78dad9e9360fd342641ffbad86a2f4ef7faae
 
     // Configure the subscribers with options
     let mut sub2 = SubSocket::new(
         // TCP transport with blocking connect, usually connection happens in the background.
         Tcp::new(tcp::Config::default().blocking_connect(true)),
-<<<<<<< HEAD
     );
-=======
-    )
-    // Enable Gzip decompression
-    .with_decompressor(GzipDecompressor::new());
->>>>>>> a8e78dad9e9360fd342641ffbad86a2f4ef7faae
 
     tracing::info!("Setting up the sockets...");
     pub_socket