diff --git a/crates/ws_load_test/src/network.rs b/crates/ws_load_test/src/network.rs index 09eee0d..cafa52b 100644 --- a/crates/ws_load_test/src/network.rs +++ b/crates/ws_load_test/src/network.rs @@ -135,9 +135,7 @@ impl Connection { r.answer_offer_id = Some(offer_id); r.answer = Some(RtcAnswer { t: RtcAnswerType::Answer, - sdp: ::serde_json::json!( - {"sdp": "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-"} - ), + sdp: "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-".into() }); r.event = None; r.offers = None; diff --git a/crates/ws_load_test/src/utils.rs b/crates/ws_load_test/src/utils.rs index a8dd488..90850b5 100644 --- a/crates/ws_load_test/src/utils.rs +++ b/crates/ws_load_test/src/utils.rs @@ -52,9 +52,7 @@ fn create_announce_request( offer_id: OfferId(rng.gen()), offer: RtcOffer { t: RtcOfferType::Offer, - sdp: ::serde_json::json!( - {"sdp": "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-"} - ) + sdp: "abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-abcdefg-".into() }, }) } diff --git a/crates/ws_protocol/benches/bench_deserialize_announce_request.rs b/crates/ws_protocol/benches/bench_deserialize_announce_request.rs index a2f5e2b..429c125 100644 --- a/crates/ws_protocol/benches/bench_deserialize_announce_request.rs +++ b/crates/ws_protocol/benches/bench_deserialize_announce_request.rs @@ -17,7 +17,7 @@ pub fn bench(c: &mut Criterion) { AnnounceRequestOffer { offer: RtcOffer { t: RtcOfferType::Offer, - sdp: ::serde_json::json!({ "sdp": "abcdef" }), + sdp: "abcdef".into(), }, offer_id, } @@ -35,7 +35,7 @@ pub fn bench(c: &mut Criterion) { numwant: Some(offers_len), answer: Some(RtcAnswer { t: RtcAnswerType::Answer, - sdp: ::serde_json::json!({ "sdp": "abcdef" }), + sdp: "abcdef".into(), }), answer_to_peer_id: Some(peer_id), answer_offer_id: Some(OfferId(info_hash.0)), diff --git a/crates/ws_protocol/src/common.rs b/crates/ws_protocol/src/common.rs index ea396a9..e426f70 100644 --- a/crates/ws_protocol/src/common.rs +++ b/crates/ws_protocol/src/common.rs @@ -50,7 +50,7 @@ pub struct RtcOffer { /// Always "offer" #[serde(rename = "type")] pub t: RtcOfferType, - pub sdp: ::serde_json::Value, + pub sdp: String, } /// Nested structure with SDP answer from https://www.npmjs.com/package/simple-peer @@ -61,7 +61,7 @@ pub struct RtcAnswer { /// Always "answer" #[serde(rename = "type")] pub t: RtcAnswerType, - pub sdp: ::serde_json::Value, + pub sdp: String, } #[derive(Debug, Clone, Copy, PartialEq, Eq)] diff --git a/crates/ws_protocol/src/lib.rs b/crates/ws_protocol/src/lib.rs index a3b61e7..c0b38a5 100644 --- a/crates/ws_protocol/src/lib.rs +++ b/crates/ws_protocol/src/lib.rs @@ -38,13 +38,13 @@ mod tests { fn rtc_offer() -> RtcOffer { RtcOffer { t: RtcOfferType::Offer, - sdp: ::serde_json::json!({ "sdp": "test" }), + sdp: "test".into(), } } fn rtc_answer() -> RtcAnswer { RtcAnswer { t: RtcAnswerType::Answer, - sdp: ::serde_json::json!({ "sdp": "test" }), + sdp: "test".into(), } }