From 8144153f417d7de5aa45234e05f2a29483434c29 Mon Sep 17 00:00:00 2001
From: yngrtc <y@ngr.tc>
Date: Sat, 2 Mar 2024 13:53:49 -0800
Subject: [PATCH] remove rtc submodule

---
 .github/workflows/cargo.yml |  4 ----
 .github/workflows/grcov.yml |  2 --
 .github/workflows/tests.yml |  8 +++-----
 .gitmodules                 |  3 ---
 Cargo.toml                  | 18 +++++++++---------
 rtc                         |  1 -
 src/description/config.rs   |  2 +-
 src/handler/data.rs         |  2 +-
 8 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 rtc

diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml
index 038d882..0b0708a 100644
--- a/.github/workflows/cargo.yml
+++ b/.github/workflows/cargo.yml
@@ -22,8 +22,6 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-        with:
-          submodules: recursive
       - name: Build
         run: cargo build --verbose
       - name: Run tests
@@ -34,8 +32,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-        with:
-          submodules: recursive
       - uses: actions-rs/toolchain@v1
         with:
           toolchain: stable
diff --git a/.github/workflows/grcov.yml b/.github/workflows/grcov.yml
index 24235d7..f2f5374 100644
--- a/.github/workflows/grcov.yml
+++ b/.github/workflows/grcov.yml
@@ -28,8 +28,6 @@ jobs:
     steps:
       - name: Checkout source code
         uses: actions/checkout@v2
-        with:
-          submodules: recursive
 
       - name: Install Rust
         uses: actions-rs/toolchain@v1
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2faa233..605a7f2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,9 +2,9 @@ name: tests
 
 on:
   push:
-    branches: [master]
+    branches: [ master ]
   pull_request:
-    branches: [master]
+    branches: [ master ]
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -20,11 +20,9 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
-        with:
-          submodules: recursive
 
       - name: Build and run chat server and tests in Docker
-        run: |          
+        run: |
           docker build -t chat-server .
           docker run -d --name chat-server -p 8080:8080 -p 3478-3495:3478-3495/udp chat-server
 
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 9084f80..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "rtc"]
-	path = rtc
-	url = https://github.com/webrtc-rs/rtc
diff --git a/Cargo.toml b/Cargo.toml
index a63a638..d8b1269 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -27,15 +27,15 @@ url = { version = "2", features = [] }
 hex = { version = "0.4", features = [] }
 
 # RTC protocols
-shared = { path = "rtc/shared" }
-sdp = { path = "rtc/sdp" }
-stun = { path = "rtc/stun" }
-rtp = { path = "rtc/rtp" }
-rtcp = { path = "rtc/rtcp" }
-srtp = { path = "rtc/srtp" }
-dtls = { path = "rtc/dtls" }
-sctp = { path = "rtc/sctp" }
-data = { path = "rtc/data" }
+shared = { version = "0.1", package = "rtc-shared" }
+sdp = { version = "0.1", package = "rtc-sdp" }
+stun = { version = "0.1", package = "rtc-stun" }
+rtp = { version = "0.1", package = "rtc-rtp" }
+rtcp = { version = "0.1", package = "rtc-rtcp" }
+srtp = { version = "0.1", package = "rtc-srtp" }
+dtls = { version = "0.1", package = "rtc-dtls" }
+sctp = { version = "0.1", package = "rtc-sctp" }
+datachannel = { version = "0.1", package = "rtc-datachannel" }
 
 [dev-dependencies]
 # common
diff --git a/rtc b/rtc
deleted file mode 160000
index d819c93..0000000
--- a/rtc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit d819c93c50e014b356f7e0982e959f2f13feba73
diff --git a/src/description/config.rs b/src/description/config.rs
index a82d067..8a617e0 100644
--- a/src/description/config.rs
+++ b/src/description/config.rs
@@ -75,7 +75,7 @@ impl RTCRtpHeaderExtension {
 }
 
 /// A MediaConfig defines the codecs supported by a PeerConnection, and the
-/// configuration of those codecs. A MediaConfig must not be shared between
+/// configuration of those codecs. A MediaConfig must not be rtc-shared between
 /// PeerConnections.
 pub struct MediaConfig {
     registry: Registry,
diff --git a/src/handler/data.rs b/src/handler/data.rs
index 9ac4699..fe7b8c1 100644
--- a/src/handler/data.rs
+++ b/src/handler/data.rs
@@ -2,7 +2,7 @@ use crate::messages::{
     ApplicationMessage, DTLSMessageEvent, DataChannelEvent, DataChannelMessage,
     DataChannelMessageParams, DataChannelMessageType, MessageEvent, TaggedMessageEvent,
 };
-use data::message::{message_channel_ack::*, message_channel_open::*, message_type::*, *};
+use datachannel::message::{message_channel_ack::*, message_channel_open::*, message_type::*, *};
 use log::{debug, error, warn};
 use retty::channel::{Handler, InboundContext, InboundHandler, OutboundContext, OutboundHandler};
 use shared::error::Result;