renamed server module to protobuf

Ecdar · Dec 6, 2023 · 2f9e6aa · 2f9e6aa
1 parent 2f21830
commit 2f9e6aa
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/src/api/context_collection.rs b/src/api/context_collection.rs
@@ -1,5 +1,5 @@
 use crate::api::hashing_context::HashingContextTrait;
-use crate::api::server::server::ecdar_backend_server::EcdarBackend;
+use crate::api::server::protobuf::ecdar_backend_server::EcdarBackend;
 use crate::database::access_context::AccessContextTrait;
 use crate::database::in_use_context::InUseContextTrait;
 use crate::database::model_context::ModelContextTrait;

diff --git a/src/api/ecdar_api.rs b/src/api/ecdar_api.rs
@@ -1,4 +1,4 @@
-use super::server::server::{
+use super::server::protobuf::{
     ecdar_api_auth_server::EcdarApiAuth,
     ecdar_api_server::EcdarApi,
     ecdar_backend_server::EcdarBackend,
@@ -13,7 +13,7 @@ use super::server::server::{
 use crate::api::context_collection::ContextCollection;
 use crate::api::{
     auth::{RequestExt, Token, TokenType},
-    server::server::Model,
+    server::protobuf::Model,
 };
 use crate::database::{session_context::SessionContextTrait, user_context::UserContextTrait};
 use crate::entities::{access, in_use, model, query, session, user};

diff --git a/src/api/reveaal_context.rs b/src/api/reveaal_context.rs
@@ -1,6 +1,6 @@
-use crate::api::server::server::ecdar_backend_client::EcdarBackendClient;
-use crate::api::server::server::ecdar_backend_server::EcdarBackend;
-use crate::api::server::server::{
+use crate::api::server::protobuf::ecdar_backend_client::EcdarBackendClient;
+use crate::api::server::protobuf::ecdar_backend_server::EcdarBackend;
+use crate::api::server::protobuf::{
     QueryRequest, QueryResponse, SimulationStartRequest, SimulationStepRequest,
     SimulationStepResponse, UserTokenResponse,
 };

diff --git a/src/api/server.rs b/src/api/server.rs
@@ -5,11 +5,11 @@ use tonic::transport::Server;
 use crate::api::auth;
 use crate::api::context_collection::ContextCollection;
 use crate::api::ecdar_api::ConcreteEcdarApi;
-use crate::api::server::server::ecdar_api_auth_server::EcdarApiAuthServer;
-use crate::api::server::server::ecdar_api_server::EcdarApiServer;
-use crate::api::server::server::ecdar_backend_server::EcdarBackendServer;
+use crate::api::server::protobuf::ecdar_api_auth_server::EcdarApiAuthServer;
+use crate::api::server::protobuf::ecdar_api_server::EcdarApiServer;
+use crate::api::server::protobuf::ecdar_backend_server::EcdarBackendServer;
 
-pub mod server {
+pub mod protobuf {
     tonic::include_proto!("ecdar_proto_buf");
 }
 

diff --git a/src/database/model_context.rs b/src/database/model_context.rs
@@ -1,7 +1,7 @@
 use crate::database::database_context::DatabaseContextTrait;
 use crate::entities::{access, model, query};
 
-use crate::api::server::server::ModelInfo;
+use crate::api::server::protobuf::ModelInfo;
 use crate::EntityContextTrait;
 use async_trait::async_trait;
 use sea_orm::{

diff --git a/src/tests/api/access_logic.rs b/src/tests/api/access_logic.rs
@@ -1,5 +1,5 @@
-use crate::api::server::server::ecdar_api_server::EcdarApi;
-use crate::api::server::server::{CreateAccessRequest, DeleteAccessRequest, UpdateAccessRequest};
+use crate::api::server::protobuf::ecdar_api_server::EcdarApi;
+use crate::api::server::protobuf::{CreateAccessRequest, DeleteAccessRequest, UpdateAccessRequest};
 use crate::entities::access;
 use crate::tests::api::helpers::{get_mock_concrete_ecdar_api, get_mock_services};
 use mockall::predicate;

diff --git a/src/tests/api/helpers.rs b/src/tests/api/helpers.rs
@@ -4,9 +4,9 @@ use crate::api::auth::TokenType;
 use crate::api::context_collection::ContextCollection;
 use crate::api::ecdar_api::ConcreteEcdarApi;
 use crate::api::hashing_context::HashingContextTrait;
-use crate::api::server::server::ecdar_backend_server::EcdarBackend;
-use crate::api::server::server::ModelInfo;
-use crate::api::server::server::{
+use crate::api::server::protobuf::ecdar_backend_server::EcdarBackend;
+use crate::api::server::protobuf::ModelInfo;
+use crate::api::server::protobuf::{
     QueryRequest, QueryResponse, SimulationStartRequest, SimulationStepRequest,
     SimulationStepResponse, UserTokenResponse,
 };

diff --git a/src/tests/api/model_logic.rs b/src/tests/api/model_logic.rs
@@ -1,7 +1,7 @@
 use crate::{
     api::{
         auth::TokenType,
-        server::server::{
+        server::protobuf::{
             component::Rep, ecdar_api_server::EcdarApi, Component, ComponentsInfo,
             CreateModelRequest, DeleteModelRequest, GetModelRequest, ModelInfo, UpdateModelRequest,
         },

diff --git a/src/tests/api/query_logic.rs b/src/tests/api/query_logic.rs
@@ -1,5 +1,5 @@
-use crate::api::server::server::ecdar_api_server::EcdarApi;
-use crate::api::server::server::{CreateQueryRequest, DeleteQueryRequest, UpdateQueryRequest};
+use crate::api::server::protobuf::ecdar_api_server::EcdarApi;
+use crate::api::server::protobuf::{CreateQueryRequest, DeleteQueryRequest, UpdateQueryRequest};
 use crate::entities::query;
 use crate::tests::api::helpers::{get_mock_concrete_ecdar_api, get_mock_services};
 use mockall::predicate;

diff --git a/src/tests/api/session_logic.rs b/src/tests/api/session_logic.rs
@@ -1,4 +1,4 @@
-use crate::api::server::server::GetAuthTokenRequest;
+use crate::api::server::protobuf::GetAuthTokenRequest;
 use crate::api::{auth::TokenType, ecdar_api::handle_session};
 use crate::entities::session;
 use crate::tests::api::helpers::get_mock_services;

diff --git a/src/tests/api/user_logic.rs b/src/tests/api/user_logic.rs
@@ -1,6 +1,6 @@
-use crate::api::server::server::ecdar_api_auth_server::EcdarApiAuth;
-use crate::api::server::server::ecdar_api_server::EcdarApi;
-use crate::api::server::server::{CreateUserRequest, UpdateUserRequest};
+use crate::api::server::protobuf::ecdar_api_auth_server::EcdarApiAuth;
+use crate::api::server::protobuf::ecdar_api_server::EcdarApi;
+use crate::api::server::protobuf::{CreateUserRequest, UpdateUserRequest};
 use crate::entities::user;
 use crate::tests::api::helpers::{get_mock_concrete_ecdar_api, get_mock_services};
 use mockall::predicate;