Fix senderReceiver array usage

web-platform-tests · Nov 20, 2018 · 1d0a0f3 · 1d0a0f3
1 parent 339c433
commit 1d0a0f3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 21 deletions.
diff --git a/webrtc/RTCDtlsTransport-getRemoteCertificates.html b/webrtc/RTCDtlsTransport-getRemoteCertificates.html
@@ -48,15 +48,12 @@
     await doSignalingHandshake(pc1, pc2);
 
     const dtlsTransports = [
-      pc1.getSenders().transport,
-      pc1.getReceivers().transport,
-      pc1.getSenders().rtcpTransport,
-      pc1.getReceivers().rtcpTransport,
-      pc2.getSenders().transport,
-      pc2.getReceivers().transport,
-      pc2.getSenders().rtcpTransport,
-      pc2.getReceivers().rtcpTransport,
+      ...pc1.getSenders(),
+      ...pc1.getReceivers(),
+      ...pc2.getSenders(),
+      ...pc2.getReceivers()
     ]
+    .map(senderReceiver => senderReceiver.transport)
     .filter(dtlsTransport => dtlsTransport); // filter null/undefined
 
     assert_greater_than(dtlsTransports.length, 2, 'expect to find at least 2 RTCDtlsTransports');

diff --git a/webrtc/RTCIceTransport.html b/webrtc/RTCIceTransport.html
@@ -121,15 +121,12 @@
     await doSignalingHandshake(pc1, pc2);
 
     const iceTransports = [
-      pc1.getSenders().transport,
-      pc1.getReceivers().transport,
-      pc1.getSenders().rtcpTransport,
-      pc1.getReceivers().rtcpTransport,
-      pc2.getSenders().transport,
-      pc2.getReceivers().transport,
-      pc2.getSenders().rtcpTransport,
-      pc2.getReceivers().rtcpTransport,
+      ...pc1.getSenders(),
+      ...pc1.getReceivers(),
+      ...pc2.getSenders(),
+      ...pc2.getReceivers()
     ]
+    .map(senderReceiver => senderReceiver.transport)
     .filter(dtlsTransport => dtlsTransport) // filter null/undefined
     .map(dtlsTransport => dtlsTransport.iceTransport)
     .filter(iceTransport => iceTransport); // filter null/undefined
@@ -155,12 +152,11 @@
     const offer = await pc.createOffer();
     await pc.setLocalDescription(offer);
 
-    const iceTransports = [
-      pc.getSenders().transport,
-      pc.getReceivers().transport,
-      pc.getSenders().rtcpTransport,
-      pc.getReceivers().rtcpTransport
+    const iceTransports =[
+      ...pc.getSenders(),
+      ...pc.getReceivers()
     ]
+    .map(senderReceiver => senderReceiver.transport)
     .filter(dtlsTransport => dtlsTransport) // filter null/undefined
     .map(dtlsTransport => dtlsTransport.iceTransport)
     .filter(iceTransport => iceTransport); // filter null/undefined