From f0f739c02c19cea0c7e0bcd71bac0375eea60ae8 Mon Sep 17 00:00:00 2001 From: WiseDev <83840010+wisedevik@users.noreply.github.com> Date: Fri, 28 Aug 2026 16:27:34 +0300 Subject: [PATCH] drop the commentary and run a workspace-wide format pass --- .gitignore | 2 ++ crates/auth-service/src/main.rs | 2 +- crates/auth-service/src/service.rs | 8 ++++---- crates/auth-service/src/store/mod.rs | 2 +- crates/auth-service/src/store/postgres.rs | 4 ++-- crates/logic/src/commands/achievement.rs | 4 ++-- crates/logic/src/commands/battle.rs | 4 ++-- crates/logic/src/commands/chest.rs | 4 ++-- crates/logic/src/commands/command.rs | 4 ++-- crates/logic/src/commands/deck.rs | 4 ++-- crates/logic/src/commands/manager.rs | 2 +- crates/logic/src/commands/matchmake.rs | 4 ++-- crates/logic/src/commands/reward.rs | 2 +- crates/logic/src/commands/shop.rs | 4 ++-- crates/logic/src/commands/spells.rs | 4 ++-- crates/logic/src/commands/ui.rs | 4 ++-- .../logic/src/messages/available_server_command.rs | 2 +- crates/logic/src/messages/battle_event.rs | 2 +- crates/logic/src/messages/end_client_turn.rs | 2 +- crates/logic/src/messages/login.rs | 2 +- crates/logic/src/messages/matchmake.rs | 2 +- crates/logic/src/messages/mod.rs | 4 ++-- crates/logic/src/messages/own_home_data.rs | 2 +- crates/logic/src/messages/sector_command.rs | 2 +- crates/logic/src/messages/start_mission.rs | 2 +- crates/logic/src/model/chest.rs | 2 +- crates/logic/src/model/client_avatar.rs | 2 +- crates/logic/src/model/client_home.rs | 2 +- crates/logic/src/model/data_slot.rs | 2 +- crates/logic/src/model/spell.rs | 2 +- crates/scroll-server/src/main.rs | 4 ++-- crates/service-rpc/src/auth.rs | 2 +- crates/service-rpc/src/client.rs | 10 +++++----- crates/service-rpc/src/game.rs | 2 +- crates/service-rpc/src/server.rs | 4 ++-- crates/storage/src/pool.rs | 4 ++-- crates/titan/src/codec.rs | 2 +- crates/titan/src/crypto/mod.rs | 2 +- crates/titan/src/csv/table.rs | 2 +- crates/titan/src/factory.rs | 4 ++-- crates/titan/src/lib.rs | 2 +- crates/titan/src/message.rs | 4 ++-- crates/titan/src/net/messaging.rs | 12 ++++++------ 43 files changed, 72 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index 2aa83a1..ba521d7 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ /data *.json.tmp docs/protocol.md +__pycache__/ +*.pyc diff --git a/crates/auth-service/src/main.rs b/crates/auth-service/src/main.rs index 7392004..42ed0ae 100644 --- a/crates/auth-service/src/main.rs +++ b/crates/auth-service/src/main.rs @@ -1,6 +1,6 @@ -use std::sync::Arc; use auth_service::{AuthConfig, AuthService}; use service_rpc::serve; +use std::sync::Arc; use tokio::net::TcpListener; #[tokio::main] async fn main() -> Result<(), Box> { diff --git a/crates/auth-service/src/service.rs b/crates/auth-service/src/service.rs index 038eac1..d1ec664 100644 --- a/crates/auth-service/src/service.rs +++ b/crates/auth-service/src/service.rs @@ -1,11 +1,11 @@ -use std::sync::Arc; +use crate::config::AuthConfig; +use crate::store::{unavailable, AccountStore}; +use crate::time::{days_between, format_utc, unix_millis, unix_seconds}; use service_rpc::{ AccountRef, AuthApi, AuthRequest, AuthResponse, DeviceInfo, LoginOutcome, RpcResult, RpcService, Session, }; -use crate::config::AuthConfig; -use crate::store::{unavailable, AccountStore}; -use crate::time::{days_between, format_utc, unix_millis, unix_seconds}; +use std::sync::Arc; fn connect_failed(error: storage::StorageError) -> std::io::Error { std::io::Error::other(format!( "{error}\ncreate the database with `createdb scroll`, or point DATABASE_URL somewhere else" diff --git a/crates/auth-service/src/store/mod.rs b/crates/auth-service/src/store/mod.rs index b0e5bac..09385ac 100644 --- a/crates/auth-service/src/store/mod.rs +++ b/crates/auth-service/src/store/mod.rs @@ -1,9 +1,9 @@ mod postgres; +pub use postgres::AccountStore; use rand::distributions::Alphanumeric; use rand::Rng; use service_rpc::{AccountRef, RpcError}; use storage::StorageError; -pub use postgres::AccountStore; pub const PASS_TOKEN_LEN: usize = 40; #[derive(Debug, Clone, PartialEq, Eq)] pub struct Account { diff --git a/crates/auth-service/src/store/postgres.rs b/crates/auth-service/src/store/postgres.rs index b2af3a5..6131c0a 100644 --- a/crates/auth-service/src/store/postgres.rs +++ b/crates/auth-service/src/store/postgres.rs @@ -1,7 +1,7 @@ -use service_rpc::AccountRef; -use storage::{Database, DatabaseConfig, Result, Row}; use crate::store::{generate_pass_token, Account}; use crate::time::unix_seconds; +use service_rpc::AccountRef; +use storage::{Database, DatabaseConfig, Result, Row}; pub struct AccountStore { database: Database, } diff --git a/crates/logic/src/commands/achievement.rs b/crates/logic/src/commands/achievement.rs index 3e0a8b9..7a4134e 100644 --- a/crates/logic/src/commands/achievement.rs +++ b/crates/logic/src/commands/achievement.rs @@ -1,10 +1,10 @@ -use logic_derive::Command; -use titan::Payload; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::command_type; use crate::commands::header::LogicCommandHeader; use crate::data::LogicDataRef; use crate::home::LogicHomeMode; +use logic_derive::Command; +use titan::Payload; pub const COMMODITY_ACHIEVEMENT_PROGRESS: usize = 2; pub const COMMODITY_ACHIEVEMENT_CLAIMED: usize = 3; #[derive(Debug, Default, Payload, Command)] diff --git a/crates/logic/src/commands/battle.rs b/crates/logic/src/commands/battle.rs index c8081f4..c37c758 100644 --- a/crates/logic/src/commands/battle.rs +++ b/crates/logic/src/commands/battle.rs @@ -1,5 +1,3 @@ -use logic_derive::Command; -use titan::Payload; use crate::battle::LogicVector2; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::command_type; @@ -7,6 +5,8 @@ use crate::commands::header::LogicCommandHeader; use crate::data::LogicDataRef; use crate::home::LogicHomeMode; use crate::model::LogicSpell; +use logic_derive::Command; +use titan::Payload; #[derive(Debug, Default, Payload, Command)] #[command(id = command_type::DO_SPELL)] pub struct LogicDoSpellCommand { diff --git a/crates/logic/src/commands/chest.rs b/crates/logic/src/commands/chest.rs index 1048a34..60679a8 100644 --- a/crates/logic/src/commands/chest.rs +++ b/crates/logic/src/commands/chest.rs @@ -1,10 +1,10 @@ -use logic_derive::Command; -use titan::Payload; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::header::LogicCommandHeader; use crate::commands::reward::LogicReward; use crate::commands::{chest_source, command_type}; use crate::home::LogicHomeMode; +use logic_derive::Command; +use titan::Payload; #[derive(Debug, Default, Payload, Command)] #[command(id = command_type::CLAIM_REWARD)] pub struct LogicClaimRewardCommand { diff --git a/crates/logic/src/commands/command.rs b/crates/logic/src/commands/command.rs index 1900f11..2efdbac 100644 --- a/crates/logic/src/commands/command.rs +++ b/crates/logic/src/commands/command.rs @@ -1,8 +1,8 @@ +use crate::data::LogicDataRef; +use crate::home::LogicHomeMode; use std::any::Any; use std::fmt::Debug; use titan::{ByteStreamReader, ByteStreamWriter, Payload, Result}; -use crate::data::LogicDataRef; -use crate::home::LogicHomeMode; #[derive(Debug, Clone, PartialEq, Eq)] pub enum CommandOutcome { ClaimStarted { diff --git a/crates/logic/src/commands/deck.rs b/crates/logic/src/commands/deck.rs index cd6b2e8..2389c0e 100644 --- a/crates/logic/src/commands/deck.rs +++ b/crates/logic/src/commands/deck.rs @@ -1,10 +1,10 @@ -use logic_derive::Command; -use titan::Payload; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::command_type; use crate::commands::header::LogicCommandHeader; use crate::home::LogicHomeMode; use crate::model::{LogicSpell, DECK_SLOT_COUNT}; +use logic_derive::Command; +use titan::Payload; #[derive(Debug, Default, Payload, Command)] #[command(id = command_type::SWAP_SPELLS)] pub struct LogicSwapSpellsCommand { diff --git a/crates/logic/src/commands/manager.rs b/crates/logic/src/commands/manager.rs index 3e35e1d..a01ae8f 100644 --- a/crates/logic/src/commands/manager.rs +++ b/crates/logic/src/commands/manager.rs @@ -1,7 +1,7 @@ +use crate::commands::command::{CommandRegistryEntry, LogicCommand}; use std::collections::HashMap; use std::sync::{Arc, OnceLock}; use titan::{ByteStreamReader, ByteStreamWriter, Error, Payload, Result}; -use crate::commands::command::{CommandRegistryEntry, LogicCommand}; static REGISTRY: OnceLock>> = OnceLock::new(); pub struct LogicCommandManager; impl LogicCommandManager { diff --git a/crates/logic/src/commands/matchmake.rs b/crates/logic/src/commands/matchmake.rs index 182190b..8e374f1 100644 --- a/crates/logic/src/commands/matchmake.rs +++ b/crates/logic/src/commands/matchmake.rs @@ -1,9 +1,9 @@ -use logic_derive::Command; -use titan::Payload; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::command_type; use crate::commands::header::LogicCommandHeader; use crate::home::LogicHomeMode; +use logic_derive::Command; +use titan::Payload; #[derive(Debug, Default, Payload, Command)] #[command(id = command_type::UPDATE_LAST_SHOWN_LEVEL_UP)] pub struct LogicUpdateLastShownLevelUpCommand { diff --git a/crates/logic/src/commands/reward.rs b/crates/logic/src/commands/reward.rs index 731b472..17e1e57 100644 --- a/crates/logic/src/commands/reward.rs +++ b/crates/logic/src/commands/reward.rs @@ -1,5 +1,5 @@ -use titan::Payload; use crate::model::LogicSpell; +use titan::Payload; #[derive(Debug, Default, Clone, PartialEq, Eq, Payload)] pub struct LogicReward { #[codec(null_list)] diff --git a/crates/logic/src/commands/shop.rs b/crates/logic/src/commands/shop.rs index 3b4725c..e3c18fd 100644 --- a/crates/logic/src/commands/shop.rs +++ b/crates/logic/src/commands/shop.rs @@ -1,10 +1,10 @@ -use logic_derive::Command; -use titan::Payload; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::command_type; use crate::commands::header::LogicCommandHeader; use crate::data::LogicDataRef; use crate::home::LogicHomeMode; +use logic_derive::Command; +use titan::Payload; pub const WEEKDAY_MIN: i32 = 1; pub const WEEKDAY_MAX: i32 = 7; #[derive(Debug, Default, Payload, Command)] diff --git a/crates/logic/src/commands/spells.rs b/crates/logic/src/commands/spells.rs index 9b69d4a..2b26595 100644 --- a/crates/logic/src/commands/spells.rs +++ b/crates/logic/src/commands/spells.rs @@ -1,10 +1,10 @@ -use logic_derive::Command; -use titan::Payload; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::command_type; use crate::commands::header::LogicCommandHeader; use crate::data::LogicDataRef; use crate::home::LogicHomeMode; +use logic_derive::Command; +use titan::Payload; #[derive(Debug, Default, Payload, Command)] #[command(id = command_type::FUSE_SPELLS)] pub struct LogicFuseSpellsCommand { diff --git a/crates/logic/src/commands/ui.rs b/crates/logic/src/commands/ui.rs index 0684d46..edef2b1 100644 --- a/crates/logic/src/commands/ui.rs +++ b/crates/logic/src/commands/ui.rs @@ -1,9 +1,9 @@ -use logic_derive::Command; -use titan::Payload; use crate::commands::command::{CommandOutcome, Execute}; use crate::commands::command_type; use crate::commands::header::LogicCommandHeader; use crate::home::LogicHomeMode; +use logic_derive::Command; +use titan::Payload; #[derive(Debug, Default, Payload, Command)] #[command(id = command_type::HELP_OPENED)] pub struct LogicHelpOpenedCommand { diff --git a/crates/logic/src/messages/available_server_command.rs b/crates/logic/src/messages/available_server_command.rs index 282fee5..012cc23 100644 --- a/crates/logic/src/messages/available_server_command.rs +++ b/crates/logic/src/messages/available_server_command.rs @@ -1,5 +1,5 @@ -use titan::Message; use crate::commands::{LogicClaimRewardCommand, LogicCommand}; +use titan::Message; #[derive(Debug, Message)] #[message( id = 24111, diff --git a/crates/logic/src/messages/battle_event.rs b/crates/logic/src/messages/battle_event.rs index d96e9d6..85848a3 100644 --- a/crates/logic/src/messages/battle_event.rs +++ b/crates/logic/src/messages/battle_event.rs @@ -1,5 +1,5 @@ -use titan::Message; use crate::battle::LogicBattleEvent; +use titan::Message; #[derive(Debug, Default, Clone, PartialEq, Eq, Message)] #[message(id = 12951, direction = "client", name = "SendBattleEventMessage")] pub struct SendBattleEventMessage { diff --git a/crates/logic/src/messages/end_client_turn.rs b/crates/logic/src/messages/end_client_turn.rs index d7a9294..0459656 100644 --- a/crates/logic/src/messages/end_client_turn.rs +++ b/crates/logic/src/messages/end_client_turn.rs @@ -1,5 +1,5 @@ -use titan::Message; use crate::commands::LogicCommand; +use titan::Message; #[derive(Debug, Default, Message)] #[message(id = 14102, direction = "client", name = "EndClientTurnMessage")] #[codec(partial)] diff --git a/crates/logic/src/messages/login.rs b/crates/logic/src/messages/login.rs index 79c952a..85be45b 100644 --- a/crates/logic/src/messages/login.rs +++ b/crates/logic/src/messages/login.rs @@ -1,5 +1,5 @@ -use titan::{LogicLong, Message}; use crate::data::LogicDataRef; +use titan::{LogicLong, Message}; #[derive(Debug, Default, Clone, PartialEq, Eq, Message)] #[message(id = 10101, direction = "client", name = "LoginMessage")] #[codec(partial)] diff --git a/crates/logic/src/messages/matchmake.rs b/crates/logic/src/messages/matchmake.rs index 280715a..5131122 100644 --- a/crates/logic/src/messages/matchmake.rs +++ b/crates/logic/src/messages/matchmake.rs @@ -1,5 +1,5 @@ -use titan::Message; use crate::commands::LogicCommand; +use titan::Message; #[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Message)] #[message(id = 24106, direction = "server", name = "StopHomeLogicMessage")] pub struct StopHomeLogicMessage {} diff --git a/crates/logic/src/messages/mod.rs b/crates/logic/src/messages/mod.rs index 3924ec8..3c30c2a 100644 --- a/crates/logic/src/messages/mod.rs +++ b/crates/logic/src/messages/mod.rs @@ -1,4 +1,5 @@ mod available_server_command; +mod battle_event; mod battle_result; mod client_capabilities; mod client_requests; @@ -11,7 +12,6 @@ mod login_ok; mod matchmake; mod out_of_sync; mod own_home_data; -mod battle_event; mod request_sector_state; mod sector_command; mod sector_heartbeat; @@ -19,6 +19,7 @@ mod sector_state; mod server_error; mod start_mission; pub use available_server_command::AvailableServerCommandMessage; +pub use battle_event::{BattleEventMessage, SendBattleEventMessage}; pub use battle_result::{ BattleResultMessage, BATTLE_RESULT_DRAW, BATTLE_RESULT_LOSE, BATTLE_RESULT_WIN, }; @@ -36,7 +37,6 @@ pub use login_ok::LoginOkMessage; pub use matchmake::{CancelMatchmakeDoneMessage, HomeLogicStoppedMessage, StopHomeLogicMessage}; pub use out_of_sync::OutOfSyncMessage; pub use own_home_data::OwnHomeDataMessage; -pub use battle_event::{BattleEventMessage, SendBattleEventMessage}; pub use request_sector_state::RequestSectorStateMessage; pub use sector_command::SectorCommandMessage; pub use sector_heartbeat::SectorHeartbeatMessage; diff --git a/crates/logic/src/messages/own_home_data.rs b/crates/logic/src/messages/own_home_data.rs index 7ce34ff..2b7fa03 100644 --- a/crates/logic/src/messages/own_home_data.rs +++ b/crates/logic/src/messages/own_home_data.rs @@ -1,5 +1,5 @@ -use titan::Message; use crate::model::{LogicClientAvatar, LogicClientHome}; +use titan::Message; #[derive(Debug, Default, Clone, PartialEq, Eq, Message)] #[message(id = 24101, direction = "server", name = "OwnHomeDataMessage")] pub struct OwnHomeDataMessage { diff --git a/crates/logic/src/messages/sector_command.rs b/crates/logic/src/messages/sector_command.rs index dda9f1a..3d9b045 100644 --- a/crates/logic/src/messages/sector_command.rs +++ b/crates/logic/src/messages/sector_command.rs @@ -1,5 +1,5 @@ -use titan::Message; use crate::commands::LogicCommand; +use titan::Message; #[derive(Debug, Default, Message)] #[message(id = 12904, direction = "client", name = "SectorCommandMessage")] #[codec(partial)] diff --git a/crates/logic/src/messages/start_mission.rs b/crates/logic/src/messages/start_mission.rs index c3bab80..6f4d36c 100644 --- a/crates/logic/src/messages/start_mission.rs +++ b/crates/logic/src/messages/start_mission.rs @@ -1,5 +1,5 @@ -use titan::Message; use crate::data::LogicDataRef; +use titan::Message; #[derive(Debug, Default, Clone, PartialEq, Eq, Message)] #[message(id = 14104, direction = "client", name = "StartMissionMessage")] pub struct StartMissionMessage { diff --git a/crates/logic/src/model/chest.rs b/crates/logic/src/model/chest.rs index 036efd9..8ddf4e0 100644 --- a/crates/logic/src/model/chest.rs +++ b/crates/logic/src/model/chest.rs @@ -1,6 +1,6 @@ -use titan::Payload; use crate::data::{LogicDataRef, LogicTreasureChestData}; use crate::model::LogicTimer; +use titan::Payload; #[derive(Debug, Clone, Copy, PartialEq, Eq)] pub enum ChestSource { Free = 0, diff --git a/crates/logic/src/model/client_avatar.rs b/crates/logic/src/model/client_avatar.rs index 4e2e3b8..8545cb5 100644 --- a/crates/logic/src/model/client_avatar.rs +++ b/crates/logic/src/model/client_avatar.rs @@ -1,6 +1,6 @@ -use titan::{LogicLong, Payload}; use crate::data::{LogicArenaData, LogicDataRef}; use crate::model::LogicDataSlot; +use titan::{LogicLong, Payload}; pub const COMMODITY_TYPE_COUNT: usize = 6; #[derive(Debug, Clone, PartialEq, Eq, Payload)] pub struct LogicCommodityStore { diff --git a/crates/logic/src/model/client_home.rs b/crates/logic/src/model/client_home.rs index a52eb06..8690475 100644 --- a/crates/logic/src/model/client_home.rs +++ b/crates/logic/src/model/client_home.rs @@ -1,6 +1,6 @@ -use titan::{LogicLong, Payload}; use crate::data::{LogicArenaData, LogicDataRef}; use crate::model::{LogicChest, LogicDataSlot, LogicSpellCollection, LogicSpellDeck, LogicTimer}; +use titan::{LogicLong, Payload}; pub const TUTORIAL_BITSET_WORDS: usize = 8; #[derive(Debug, Default, Clone, PartialEq, Eq, Payload)] pub struct LogicClientHome { diff --git a/crates/logic/src/model/data_slot.rs b/crates/logic/src/model/data_slot.rs index 6b936a8..fc4e3ed 100644 --- a/crates/logic/src/model/data_slot.rs +++ b/crates/logic/src/model/data_slot.rs @@ -1,5 +1,5 @@ -use titan::Payload; use crate::data::LogicDataRef; +use titan::Payload; #[derive(Debug, Default, Clone, PartialEq, Eq, Payload)] pub struct LogicDataSlot { pub data: LogicDataRef, diff --git a/crates/logic/src/model/spell.rs b/crates/logic/src/model/spell.rs index d912da8..84831a2 100644 --- a/crates/logic/src/model/spell.rs +++ b/crates/logic/src/model/spell.rs @@ -1,5 +1,5 @@ -use titan::Payload; use crate::data::LogicDataRef; +use titan::Payload; pub const DECK_SLOT_COUNT: usize = 8; #[derive(Debug, Default, Clone, PartialEq, Eq, Payload)] pub struct LogicSpell { diff --git a/crates/scroll-server/src/main.rs b/crates/scroll-server/src/main.rs index fee78e9..2aac855 100644 --- a/crates/scroll-server/src/main.rs +++ b/crates/scroll-server/src/main.rs @@ -1,9 +1,9 @@ mod supervisor; -use std::sync::Arc; +use crate::supervisor::ServiceSpec; use auth_service::{AuthConfig, AuthService}; use game_service::{GameConfig, GameService}; use gateway::{Backends, GatewayConfig}; -use crate::supervisor::ServiceSpec; +use std::sync::Arc; fn supervised() -> bool { std::env::var("SCROLL_MODE") .map(|mode| mode.eq_ignore_ascii_case("supervised")) diff --git a/crates/service-rpc/src/auth.rs b/crates/service-rpc/src/auth.rs index 1b1817d..9bb9ad4 100644 --- a/crates/service-rpc/src/auth.rs +++ b/crates/service-rpc/src/auth.rs @@ -1,6 +1,6 @@ -use serde::{Deserialize, Serialize}; use crate::error::RpcResult; use crate::game::AccountRef; +use serde::{Deserialize, Serialize}; #[derive(Debug, Default, Clone, PartialEq, Eq, Serialize, Deserialize)] pub struct DeviceInfo { #[serde(default)] diff --git a/crates/service-rpc/src/client.rs b/crates/service-rpc/src/client.rs index b4c4839..c7a6d6d 100644 --- a/crates/service-rpc/src/client.rs +++ b/crates/service-rpc/src/client.rs @@ -1,10 +1,10 @@ -use std::marker::PhantomData; -use std::sync::atomic::{AtomicUsize, Ordering}; -use serde::{de::DeserializeOwned, Serialize}; -use tokio::net::TcpStream; -use tokio::sync::Mutex; use crate::error::{RpcError, RpcResult}; use crate::server::{read_frame, write_frame}; +use serde::{de::DeserializeOwned, Serialize}; +use std::marker::PhantomData; +use std::sync::atomic::{AtomicUsize, Ordering}; +use tokio::net::TcpStream; +use tokio::sync::Mutex; pub const DEFAULT_POOL_SIZE: usize = 8; pub struct RpcClient { endpoint: String, diff --git a/crates/service-rpc/src/game.rs b/crates/service-rpc/src/game.rs index 329a74d..eaa4e16 100644 --- a/crates/service-rpc/src/game.rs +++ b/crates/service-rpc/src/game.rs @@ -1,6 +1,6 @@ -use serde::{Deserialize, Serialize}; use crate::error::RpcResult; use crate::wire::WireMessage; +use serde::{Deserialize, Serialize}; #[derive( Debug, Default, Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize, )] diff --git a/crates/service-rpc/src/server.rs b/crates/service-rpc/src/server.rs index f260414..4eaee80 100644 --- a/crates/service-rpc/src/server.rs +++ b/crates/service-rpc/src/server.rs @@ -1,8 +1,8 @@ -use std::sync::Arc; +use crate::error::{RpcError, RpcResult}; use serde::{de::DeserializeOwned, Serialize}; +use std::sync::Arc; use tokio::io::{AsyncReadExt, AsyncWriteExt}; use tokio::net::{TcpListener, TcpStream}; -use crate::error::{RpcError, RpcResult}; pub const MAX_FRAME_LEN: usize = 8 * 1024 * 1024; #[async_trait::async_trait] pub trait RpcService: Send + Sync + 'static { diff --git a/crates/storage/src/pool.rs b/crates/storage/src/pool.rs index d9e98a0..ecf7eaf 100644 --- a/crates/storage/src/pool.rs +++ b/crates/storage/src/pool.rs @@ -1,7 +1,7 @@ -use std::time::Duration; +use crate::error::Result; use sqlx::postgres::{PgConnectOptions, PgPoolOptions}; use sqlx::{ConnectOptions, PgPool}; -use crate::error::Result; +use std::time::Duration; pub const DEFAULT_URL: &str = "postgres:///scroll"; #[derive(Debug, Clone)] pub struct DatabaseConfig { diff --git a/crates/titan/src/codec.rs b/crates/titan/src/codec.rs index 745d0a7..c58e884 100644 --- a/crates/titan/src/codec.rs +++ b/crates/titan/src/codec.rs @@ -1,8 +1,8 @@ -use std::marker::PhantomData; use crate::error::{Error, Result}; use crate::io::{ByteStreamReader, ByteStreamWriter, MAX_COLLECTION_LEN}; use crate::logic_long::LogicLong; use crate::message::Payload; +use std::marker::PhantomData; pub trait Codec { fn write(writer: &mut ByteStreamWriter, value: &T) -> Result<()>; fn read(reader: &mut ByteStreamReader<'_>) -> Result; diff --git a/crates/titan/src/crypto/mod.rs b/crates/titan/src/crypto/mod.rs index ae3b1ff..b16e9d8 100644 --- a/crates/titan/src/crypto/mod.rs +++ b/crates/titan/src/crypto/mod.rs @@ -1,6 +1,6 @@ mod rc4; -pub use rc4::Rc4Encrypter; use crate::error::Result; +pub use rc4::Rc4Encrypter; pub const SCROLL_RC4_KEY: &str = "fhsd6f86f67rt8fw78fw789we78r9789wer6re"; pub const SCROLL_RC4_NONCE: &str = "nonce"; pub trait StreamEncrypter: Send + Sync { diff --git a/crates/titan/src/csv/table.rs b/crates/titan/src/csv/table.rs index d812ebe..86595e2 100644 --- a/crates/titan/src/csv/table.rs +++ b/crates/titan/src/csv/table.rs @@ -1,6 +1,6 @@ -use std::collections::HashMap; use crate::csv::row::CsvRow; use crate::csv::value::{ColumnType, CsvValue}; +use std::collections::HashMap; #[derive(Debug, Clone, PartialEq, Eq)] pub struct CsvColumn { pub name: String, diff --git a/crates/titan/src/factory.rs b/crates/titan/src/factory.rs index 68b83c7..be4d4c0 100644 --- a/crates/titan/src/factory.rs +++ b/crates/titan/src/factory.rs @@ -1,8 +1,8 @@ +use crate::error::{Error, Result}; +use crate::message::{Direction, Message, MessageMeta}; use std::collections::HashMap; use std::fmt::Debug; use std::sync::{Arc, OnceLock}; -use crate::error::{Error, Result}; -use crate::message::{Direction, Message, MessageMeta}; type DecodeFn = fn(&[u8]) -> Result>; #[derive(Clone, Copy)] pub struct RegistryEntry { diff --git a/crates/titan/src/lib.rs b/crates/titan/src/lib.rs index 2f270d3..633f339 100644 --- a/crates/titan/src/lib.rs +++ b/crates/titan/src/lib.rs @@ -21,6 +21,7 @@ pub use data_ref::GlobalId; pub use error::{Error, Result}; pub use factory::{MessageFactory, MessageRegistry}; pub use frame::{FrameCodec, FrameHeader, MessageFrame, HEADER_LEN, MAX_PAYLOAD_LEN}; +pub use inventory; pub use io::{ByteStreamReader, ByteStreamWriter}; pub use json::JsonValue; pub use logic_long::LogicLong; @@ -28,7 +29,6 @@ pub use message::{Direction, Message, MessageMeta, Payload}; pub use net::{ Incoming, Messaging, MessagingConfig, MessagingError, MessagingSender, OutboundMessage, }; -pub use inventory; pub use titan_derive::{Message, Payload}; pub mod prelude { pub use crate::codec::{ diff --git a/crates/titan/src/message.rs b/crates/titan/src/message.rs index faa5ed8..84ef3bf 100644 --- a/crates/titan/src/message.rs +++ b/crates/titan/src/message.rs @@ -1,7 +1,7 @@ -use std::any::Any; -use std::fmt::Debug; use crate::error::Result; use crate::io::{ByteStreamReader, ByteStreamWriter}; +use std::any::Any; +use std::fmt::Debug; #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] pub enum Direction { ClientToServer, diff --git a/crates/titan/src/net/messaging.rs b/crates/titan/src/net/messaging.rs index a989f31..0360ae3 100644 --- a/crates/titan/src/net/messaging.rs +++ b/crates/titan/src/net/messaging.rs @@ -1,3 +1,9 @@ +use crate::crypto::{SessionCipher, StreamEncrypter}; +use crate::error::Error; +use crate::factory::MessageFactory; +use crate::frame::{FrameCodec, FrameHeader, MessageFrame, HEADER_LEN}; +use crate::io::ByteStreamWriter; +use crate::message::Message; use std::sync::Arc; use std::time::Duration; use tokio::io::{AsyncReadExt, AsyncWriteExt}; @@ -6,12 +12,6 @@ use tokio::net::TcpStream; use tokio::sync::mpsc; use tokio::task::JoinHandle; use tokio::time::timeout; -use crate::crypto::{SessionCipher, StreamEncrypter}; -use crate::error::Error; -use crate::factory::MessageFactory; -use crate::frame::{FrameCodec, FrameHeader, MessageFrame, HEADER_LEN}; -use crate::io::ByteStreamWriter; -use crate::message::Message; #[derive(Debug, thiserror::Error)] pub enum MessagingError { #[error("io: {0}")]