make pion be the default

holochain · Oct 28, 2024 · 158b98d · 158b98d
1 parent b8eee0a
commit 158b98d
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 30 deletions.
diff --git a/Makefile b/Makefile
@@ -78,8 +78,10 @@ test: static unit
 unit:
 	cargo build --all-targets
 	RUST_BACKTRACE=1 RUST_LOG=info cargo test -- --nocapture
-	RUST_BACKTRACE=1 RUST_LOG=info cargo test --no-default-features --features backend-go-pion --manifest-path crates/tx5-connection/Cargo.toml -- --nocapture
-	RUST_BACKTRACE=1 RUST_LOG=info cargo test --no-default-features --features backend-go-pion --manifest-path crates/tx5/Cargo.toml -- --nocapture
+	#--TODO--Once libdatachannel is the default, we'll want to keep
+	#        go-pion tested for a while until we're ready to deprecate it
+	#RUST_BACKTRACE=1 RUST_LOG=info cargo test --no-default-features --features backend-go-pion --manifest-path crates/tx5-connection/Cargo.toml -- --nocapture
+	#RUST_BACKTRACE=1 RUST_LOG=info cargo test --no-default-features --features backend-go-pion --manifest-path crates/tx5/Cargo.toml -- --nocapture
 
 static: dep fmt lint docs
 	@if [ "${CI}x" != "x" ]; then git diff --exit-code; fi

diff --git a/crates/tx5-connection/Cargo.toml b/crates/tx5-connection/Cargo.toml
@@ -11,7 +11,7 @@ categories = ["network-programming"]
 edition = "2021"
 
 [features]
-default = [ "backend-libdatachannel" ]
+default = [ "backend-go-pion" ]
 
 # use the libdatachannel crate as the webrtc backend
 backend-libdatachannel = [ "dep:datachannel" ]

diff --git a/crates/tx5-connection/src/webrtc/libdatachannel.rs b/crates/tx5-connection/src/webrtc/libdatachannel.rs
@@ -347,29 +347,27 @@ async fn task_err(
             Cmd::RecvMessage(msg) => {
                 evt_send.send(WebrtcEvt::Message(msg)).await?;
             }
-            Cmd::RecvDescription(desc) => {
-                match desc.sdp_type {
-                    datachannel::SdpType::Offer => {
-                        evt_send
-                            .send(WebrtcEvt::GeneratedOffer(
-                                serde_json::to_string(&desc)?.into_bytes(),
-                            ))
-                            .await?;
-                    }
-                    datachannel::SdpType::Answer => {
-                        evt_send
-                            .send(WebrtcEvt::GeneratedAnswer(
-                                serde_json::to_string(&desc)?.into_bytes(),
-                            ))
-                            .await?;
-                    }
-                    _ => {
-                        return Err(std::io::Error::other(
-                            "unhandled sdp desc type",
+            Cmd::RecvDescription(desc) => match desc.sdp_type {
+                datachannel::SdpType::Offer => {
+                    evt_send
+                        .send(WebrtcEvt::GeneratedOffer(
+                            serde_json::to_string(&desc)?.into_bytes(),
                         ))
-                    }
+                        .await?;
                 }
-            }
+                datachannel::SdpType::Answer => {
+                    evt_send
+                        .send(WebrtcEvt::GeneratedAnswer(
+                            serde_json::to_string(&desc)?.into_bytes(),
+                        ))
+                        .await?;
+                }
+                _ => {
+                    return Err(std::io::Error::other(
+                        "unhandled sdp desc type",
+                    ))
+                }
+            },
             Cmd::DataChanOpen => {
                 evt_send.send(WebrtcEvt::Ready).await?;
             }

diff --git a/crates/tx5/Cargo.toml b/crates/tx5/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["holochain", "holo", "p2p", "webrtc", "networking"]
 categories = ["network-programming"]
 
 [features]
-default = [ "backend-libdatachannel" ]
+default = [ "backend-go-pion" ]
 
 # use the libdatachannel crate as the webrtc backend
 backend-libdatachannel = [ "tx5-connection/backend-libdatachannel" ]

diff --git a/crates/tx5/src/test.rs b/crates/tx5/src/test.rs
@@ -49,10 +49,7 @@ impl TestEp {
                         }
                     }
                     EndpointEvent::Disconnected { peer_url } => {
-                        if send
-                            .send((peer_url, DISCON.to_vec()))
-                            .is_err()
-                        {
+                        if send.send((peer_url, DISCON.to_vec())).is_err() {
                             break;
                         }
                     }
@@ -115,7 +112,8 @@ impl Test {
         let _ = tx5_core::Tx5InitConfig {
             tracing_enabled: true,
             ..Default::default()
-        }.set_as_global_default();
+        }
+        .set_as_global_default();
 
         let mut this = Test {
             sig_srv_hnd: None,