From b822698a43631e5cd105c9be158e223fd56ea7b2 Mon Sep 17 00:00:00 2001 From: Stuart Woodbury Date: Fri, 3 Nov 2023 11:59:18 -0400 Subject: [PATCH] fix fmt --- .../src/blink_impl/call_initiation.rs | 26 ++++--------------- .../warp-blink-wrtc/src/blink_impl/mod.rs | 14 +++------- .../src/blink_impl/webrtc_handler.rs | 21 +++++---------- 3 files changed, 14 insertions(+), 47 deletions(-) diff --git a/extensions/warp-blink-wrtc/src/blink_impl/call_initiation.rs b/extensions/warp-blink-wrtc/src/blink_impl/call_initiation.rs index ce84ca49b..62ece8fe5 100644 --- a/extensions/warp-blink-wrtc/src/blink_impl/call_initiation.rs +++ b/extensions/warp-blink-wrtc/src/blink_impl/call_initiation.rs @@ -1,39 +1,23 @@ - - - - - use std::{ collections::{HashMap, HashSet}, sync::Arc, }; - - - use futures::StreamExt; -use rust_ipfs::{SubscriptionStream}; +use rust_ipfs::SubscriptionStream; -use tokio::{ - sync::{ - broadcast::{Sender}, - RwLock, - }, -}; +use tokio::sync::{broadcast::Sender, RwLock}; use uuid::Uuid; use warp::{ - blink::{BlinkEventKind}, + blink::BlinkEventKind, crypto::{did_key::Generate, DID}, error::Error, }; use crate::{ - signaling::{InitiationSignal}, - store::{ - decode_gossipsub_msg_ecdh, - PeerIdExt, - }, + signaling::InitiationSignal, + store::{decode_gossipsub_msg_ecdh, PeerIdExt}, }; use super::data::PendingCall; diff --git a/extensions/warp-blink-wrtc/src/blink_impl/mod.rs b/extensions/warp-blink-wrtc/src/blink_impl/mod.rs index 34fc1b259..db7306a56 100644 --- a/extensions/warp-blink-wrtc/src/blink_impl/mod.rs +++ b/extensions/warp-blink-wrtc/src/blink_impl/mod.rs @@ -19,13 +19,7 @@ use host_media::{ }, mp4_logger::Mp4LoggerConfig, }; -use std::{ - any::Any, - collections::{HashMap}, - str::FromStr, - sync::Arc, - time::Duration, -}; +use std::{any::Any, collections::HashMap, str::FromStr, sync::Arc, time::Duration}; use webrtc::rtp_transceiver::rtp_codec::RTCRtpCodecCapability; use anyhow::{bail, Context}; @@ -54,10 +48,8 @@ use warp::{ use crate::{ host_media::audio::AudioSampleRate, signaling::{ipfs_routes, CallSignal, InitiationSignal}, - simple_webrtc::events::{WebRtcEventStream}, - store::{ - send_signal_aes, send_signal_ecdh, - }, + simple_webrtc::events::WebRtcEventStream, + store::{send_signal_aes, send_signal_ecdh}, }; // implements Blink diff --git a/extensions/warp-blink-wrtc/src/blink_impl/webrtc_handler.rs b/extensions/warp-blink-wrtc/src/blink_impl/webrtc_handler.rs index 28347debb..8af337f7d 100644 --- a/extensions/warp-blink-wrtc/src/blink_impl/webrtc_handler.rs +++ b/extensions/warp-blink-wrtc/src/blink_impl/webrtc_handler.rs @@ -5,27 +5,18 @@ use crate::simple_webrtc; use futures::StreamExt; use rust_ipfs::{Ipfs, SubscriptionStream}; use std::sync::Arc; -use tokio::{ - sync::{ - broadcast::{self, Sender}, - RwLock, - }, +use tokio::sync::{ + broadcast::{self, Sender}, + RwLock, }; -use warp::{ - blink::{BlinkEventKind}, - crypto::{DID}, - error::Error, -}; +use warp::{blink::BlinkEventKind, crypto::DID, error::Error}; use crate::{ - host_media::audio::{AudioHardwareConfig}, + host_media::audio::AudioHardwareConfig, signaling::{ipfs_routes, CallSignal, PeerSignal}, simple_webrtc::events::{EmittedEvents, WebRtcEventStream}, - store::{ - decode_gossipsub_msg_aes, decode_gossipsub_msg_ecdh, send_signal_ecdh, - PeerIdExt, - }, + store::{decode_gossipsub_msg_aes, decode_gossipsub_msg_ecdh, send_signal_ecdh, PeerIdExt}, }; pub struct WebRtcHandlerParams {