get rid of negotiated arg

turns out we can pass negotiated: true and id=1 on both ends.
melekes · Aug 29, 2022 · a2c74c6 · a2c74c6
1 parent 59e0ded
commit a2c74c6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/transports/webrtc/src/transport.rs b/transports/webrtc/src/transport.rs
@@ -187,7 +187,7 @@ impl Transport for WebRTCTransport {
             .await?;
 
             // Open a data channel to do Noise on top and verify the remote.
-            let data_channel = conn.create_initial_upgrade_data_channel(false).await?;
+            let data_channel = conn.create_initial_upgrade_data_channel().await?;
 
             trace!("noise handshake with addr={}", remote);
             let peer_id = perform_noise_handshake_outbound(
@@ -577,8 +577,7 @@ async fn upgrade(
     .await?;
 
     // Open a data channel to do Noise on top and verify the remote.
-    // NOTE: channel is already negotiated by the client
-    let data_channel = conn.create_initial_upgrade_data_channel(true).await?;
+    let data_channel = conn.create_initial_upgrade_data_channel().await?;
 
     trace!(
         "noise handshake with addr={} (ufrag={})",

diff --git a/transports/webrtc/src/webrtc_connection.rs b/transports/webrtc/src/webrtc_connection.rs
@@ -127,18 +127,15 @@ impl WebRTCConnection {
         return Ok(Self { peer_connection });
     }
 
-    pub async fn create_initial_upgrade_data_channel(
-        &self,
-        negotiated: bool,
-    ) -> Result<Arc<DataChannel>, Error> {
+    pub async fn create_initial_upgrade_data_channel(&self) -> Result<Arc<DataChannel>, Error> {
         // Open a data channel to do Noise on top and verify the remote.
         let data_channel = self
             .peer_connection
             .create_data_channel(
                 "data",
                 Some(RTCDataChannelInit {
                     id: Some(1),
-                    negotiated: if negotiated { Some(negotiated) } else { None },
+                    negotiated: Some(true),
                     ..RTCDataChannelInit::default()
                 }),
             )