From 76bc7e5e8bee9b3994855b071408a1de582d64f3 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Fri, 7 Oct 2022 16:50:05 +0200
Subject: lib cleanup

---
 client-native-lib/src/peer.rs | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

(limited to 'client-native-lib/src/peer.rs')

diff --git a/client-native-lib/src/peer.rs b/client-native-lib/src/peer.rs
index d2a6fbc..d45d0e5 100644
--- a/client-native-lib/src/peer.rs
+++ b/client-native-lib/src/peer.rs
@@ -9,7 +9,6 @@ use crate::{
 };
 use log::info;
 use std::sync::Arc;
-use tokio::sync::mpsc::UnboundedSender;
 use webrtc::{
     ice_transport::{ice_candidate::RTCIceCandidate, ice_server::RTCIceServer},
     peer_connection::{
@@ -19,17 +18,13 @@ use webrtc::{
 };
 
 pub struct Peer {
-    pub signal: UnboundedSender<(usize, RelayMessage)>,
+    pub state: Arc<State>,
     pub peer_connection: RTCPeerConnection,
     pub id: usize,
 }
 
 impl Peer {
-    pub async fn create(
-        state: Arc<State>,
-        signal: UnboundedSender<(usize, RelayMessage)>,
-        id: usize,
-    ) -> Arc<Self> {
+    pub async fn create(state: Arc<State>, id: usize) -> Arc<Self> {
         info!("({id}) peer joined");
         let config = RTCConfiguration {
             ice_servers: vec![RTCIceServer {
@@ -41,7 +36,7 @@ impl Peer {
 
         let peer_connection = state.api.new_peer_connection(config).await.unwrap();
         let peer = Arc::new(Self {
-            signal,
+            state: state.clone(),
             peer_connection,
             id,
         });
@@ -92,7 +87,7 @@ impl Peer {
     }
 
     pub async fn send_relay(&self, inner: RelayMessage) {
-        self.signal.send((self.id, inner)).unwrap()
+        self.state.send_relay(self.id, inner).await
     }
 
     pub async fn on_relay(&self, p: RelayMessage) {
-- 
cgit v1.2.3-70-g09d2