From 26397a639c5cd4f7e695c8f96e5e11a73717cbc4 Mon Sep 17 00:00:00 2001 From: tetta maeda Date: Thu, 4 Apr 2024 15:50:29 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=A7?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8Bupported=5Fversion=E3=81=AE?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- moqt-core/src/modules/handlers/server_setup_handler.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/moqt-core/src/modules/handlers/server_setup_handler.rs b/moqt-core/src/modules/handlers/server_setup_handler.rs index f7debbaa..ce9575ad 100644 --- a/moqt-core/src/modules/handlers/server_setup_handler.rs +++ b/moqt-core/src/modules/handlers/server_setup_handler.rs @@ -86,7 +86,7 @@ mod success { let setup_parameters = vec![SetupParameter::RoleParameter(RoleParameter::new( RoleCase::Injection, ))]; - let client_setup_message = ClientSetupMessage::new(vec![1], setup_parameters); + let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); let underlay_type = crate::constants::UnderlayType::WebTransport; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client); @@ -102,7 +102,7 @@ mod success { SetupParameter::RoleParameter(RoleParameter::new(RoleCase::Injection)), SetupParameter::PathParameter(PathParameter::new(String::from("test"))), ]; - let client_setup_message = ClientSetupMessage::new(vec![1], setup_parameters); + let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); let underlay_type = crate::constants::UnderlayType::QUIC; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client); @@ -129,7 +129,7 @@ mod failure { fn no_setup_parameter() { let mut client = MOQTClient::new(33); let setup_parameters = vec![]; - let client_setup_message = ClientSetupMessage::new(vec![1], setup_parameters); + let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); let underlay_type = crate::constants::UnderlayType::WebTransport; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client); @@ -143,7 +143,7 @@ mod failure { let setup_parameters = vec![SetupParameter::PathParameter(PathParameter::new( String::from("test"), ))]; - let client_setup_message = ClientSetupMessage::new(vec![1], setup_parameters); + let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); let underlay_type = crate::constants::UnderlayType::WebTransport; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client); From 74146356271b013bc6843e5c161619981dee494f Mon Sep 17 00:00:00 2001 From: tetta maeda Date: Thu, 4 Apr 2024 15:51:26 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8D=98=E4=BD=93=E3=83=86=E3=82=B9?= =?UTF-8?q?=E3=83=88=E3=82=92=E5=AE=9F=E8=A1=8C=E3=81=99=E3=82=8Bjob?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .circleci/config.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa136bc3..185b8743 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,6 +14,15 @@ jobs: name: Run Clippy command: | cargo clippy -- -D warnings + unit_test: + docker: + - image: rust:latest + steps: + - checkout + - run: + name: Run Unit Tests + command: | + cargo test prettier: docker: - image: cimg/node:21.6.2 @@ -34,6 +43,10 @@ workflows: filters: branches: ignore: /main|master/ + - unit_test: + filters: + branches: + ignore: /main|master/ - prettier: filters: branches: From 2130b11789ce333432169f29689b9d2d16e10fe1 Mon Sep 17 00:00:00 2001 From: tetta maeda Date: Thu, 4 Apr 2024 15:57:54 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=A7?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E3=81=99=E3=82=8Bupported=5Fversion=E3=82=92?= =?UTF-8?q?constants=E3=81=8B=E3=82=89=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/handlers/server_setup_handler.rs | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/moqt-core/src/modules/handlers/server_setup_handler.rs b/moqt-core/src/modules/handlers/server_setup_handler.rs index ce9575ad..66aedb5d 100644 --- a/moqt-core/src/modules/handlers/server_setup_handler.rs +++ b/moqt-core/src/modules/handlers/server_setup_handler.rs @@ -71,13 +71,16 @@ pub(crate) fn setup_handler( mod success { use std::vec; - use crate::modules::{ - handlers::server_setup_handler::setup_handler, - messages::{ - client_setup_message::ClientSetupMessage, - setup_parameters::{PathParameter, RoleCase, RoleParameter, SetupParameter}, + use crate::{ + constants, + modules::{ + handlers::server_setup_handler::setup_handler, + messages::{ + client_setup_message::ClientSetupMessage, + setup_parameters::{PathParameter, RoleCase, RoleParameter, SetupParameter}, + }, + moqt_client::MOQTClient, }, - moqt_client::MOQTClient, }; #[test] @@ -86,7 +89,8 @@ mod success { let setup_parameters = vec![SetupParameter::RoleParameter(RoleParameter::new( RoleCase::Injection, ))]; - let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); + let client_setup_message = + ClientSetupMessage::new(vec![constants::MOQ_TRANSPORT_VERSION], setup_parameters); let underlay_type = crate::constants::UnderlayType::WebTransport; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client); @@ -102,7 +106,8 @@ mod success { SetupParameter::RoleParameter(RoleParameter::new(RoleCase::Injection)), SetupParameter::PathParameter(PathParameter::new(String::from("test"))), ]; - let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); + let client_setup_message = + ClientSetupMessage::new(vec![constants::MOQ_TRANSPORT_VERSION], setup_parameters); let underlay_type = crate::constants::UnderlayType::QUIC; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client); @@ -116,20 +121,24 @@ mod success { mod failure { use std::vec; - use crate::modules::{ - handlers::server_setup_handler::setup_handler, - messages::{ - client_setup_message::ClientSetupMessage, - setup_parameters::{PathParameter, SetupParameter}, + use crate::{ + constants, + modules::{ + handlers::server_setup_handler::setup_handler, + messages::{ + client_setup_message::ClientSetupMessage, + setup_parameters::{PathParameter, SetupParameter}, + }, + moqt_client::MOQTClient, }, - moqt_client::MOQTClient, }; #[test] fn no_setup_parameter() { let mut client = MOQTClient::new(33); let setup_parameters = vec![]; - let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); + let client_setup_message = + ClientSetupMessage::new(vec![constants::MOQ_TRANSPORT_VERSION], setup_parameters); let underlay_type = crate::constants::UnderlayType::WebTransport; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client); @@ -143,7 +152,8 @@ mod failure { let setup_parameters = vec![SetupParameter::PathParameter(PathParameter::new( String::from("test"), ))]; - let client_setup_message = ClientSetupMessage::new(vec![0xff000001], setup_parameters); + let client_setup_message = + ClientSetupMessage::new(vec![constants::MOQ_TRANSPORT_VERSION], setup_parameters); let underlay_type = crate::constants::UnderlayType::WebTransport; let server_setup_message = setup_handler(client_setup_message, underlay_type, &mut client);