From 4e678457eb68a3de9531b59977a158f13ce03a2f Mon Sep 17 00:00:00 2001 From: Lucas Colombo Date: Tue, 21 May 2024 01:13:16 -0300 Subject: [PATCH] =?UTF-8?q?refactor:=20=F0=9F=94=A8=20move=20bus=20module?= =?UTF-8?q?=20to=20root?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 4 ++-- examples/bus-pub.rs | 4 ++-- examples/bus-sub.rs | 4 ++-- examples/rustler.rs | 3 ++- lib/{rustlers/bus.rs => bus/mod.rs} | 0 lib/{rustlers => }/bus/redis/mod.rs | 0 lib/{rustlers => }/bus/redis/publish.rs | 2 +- lib/{rustlers => }/bus/redis/subscribe.rs | 2 +- lib/lib.rs | 1 + lib/rustlers/mod.rs | 1 - lib/rustlers/rustler.rs | 6 +++--- lib/rustlers/svc.rs | 3 ++- 🐎 rustler-core.code-workspace | 2 +- 13 files changed, 17 insertions(+), 15 deletions(-) rename lib/{rustlers/bus.rs => bus/mod.rs} (100%) rename lib/{rustlers => }/bus/redis/mod.rs (100%) rename lib/{rustlers => }/bus/redis/publish.rs (97%) rename lib/{rustlers => }/bus/redis/subscribe.rs (98%) diff --git a/.vscode/settings.json b/.vscode/settings.json index 428cdc6..10a4476 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -33,6 +33,6 @@ "rustler.db-shm": true, "rustler.db-wal": true, "rustler.db.bkp": true - } - // "editor.formatOnSave": true + }, + "editor.formatOnSave": true } diff --git a/examples/bus-pub.rs b/examples/bus-pub.rs index 51de13d..4bd82f6 100644 --- a/examples/bus-pub.rs +++ b/examples/bus-pub.rs @@ -3,9 +3,9 @@ mod binance; use { eyre::{set_hook, DefaultHandler, Result}, lool::s, - rustler_core::rustlers::{ + rustler_core::{ bus::{self, PublisherTrait}, - MarketHourType, Quote, + rustlers::{MarketHourType, Quote}, }, }; diff --git a/examples/bus-sub.rs b/examples/bus-sub.rs index 0c6f765..bac6bd7 100644 --- a/examples/bus-sub.rs +++ b/examples/bus-sub.rs @@ -1,8 +1,8 @@ use { eyre::{set_hook, DefaultHandler, Result}, - rustler_core::rustlers::{ + rustler_core::{ bus::{self, SubscriberTrait}, - Quote, Ticker, + rustlers::{Quote, Ticker}, }, rxrust::observable::{ObservableExt, ObservableItem}, }; diff --git a/examples/rustler.rs b/examples/rustler.rs index a8c69cf..ae9649d 100644 --- a/examples/rustler.rs +++ b/examples/rustler.rs @@ -6,9 +6,10 @@ use { eyre::{set_hook, DefaultHandler, Result}, lool::logger::{info, ConsoleLogger, Level}, rustler_core::{ + bus, entities::db::get_connection, grpc, rustlerjar, - rustlers::{bus, svc::RustlersSvc, Quote}, + rustlers::{svc::RustlersSvc, Quote}, }, tokio::join, }; diff --git a/lib/rustlers/bus.rs b/lib/bus/mod.rs similarity index 100% rename from lib/rustlers/bus.rs rename to lib/bus/mod.rs diff --git a/lib/rustlers/bus/redis/mod.rs b/lib/bus/redis/mod.rs similarity index 100% rename from lib/rustlers/bus/redis/mod.rs rename to lib/bus/redis/mod.rs diff --git a/lib/rustlers/bus/redis/publish.rs b/lib/bus/redis/publish.rs similarity index 97% rename from lib/rustlers/bus/redis/publish.rs rename to lib/bus/redis/publish.rs index 0ffc4c3..7ca4aaa 100644 --- a/lib/rustlers/bus/redis/publish.rs +++ b/lib/bus/redis/publish.rs @@ -1,6 +1,6 @@ use { super::{key, BusMessage, PrefixedPubSub, RedisClient, KEY_PREFIX}, - crate::rustlers::bus::PublisherTrait, + crate::bus::PublisherTrait, eyre::Result, redis::{aio::MultiplexedConnection, AsyncCommands}, tonic::async_trait, diff --git a/lib/rustlers/bus/redis/subscribe.rs b/lib/bus/redis/subscribe.rs similarity index 98% rename from lib/rustlers/bus/redis/subscribe.rs rename to lib/bus/redis/subscribe.rs index 4239ff8..41d9582 100644 --- a/lib/rustlers/bus/redis/subscribe.rs +++ b/lib/bus/redis/subscribe.rs @@ -1,6 +1,6 @@ use { super::{key, PrefixedPubSub, RedisClient, KEY_PREFIX}, - crate::rustlers::bus::{BusMessage, SubscriberTrait}, + crate::bus::{BusMessage, SubscriberTrait}, eyre::Result, futures::StreamExt, lool::{fail, s}, diff --git a/lib/lib.rs b/lib/lib.rs index e64b7ba..e714b26 100644 --- a/lib/lib.rs +++ b/lib/lib.rs @@ -1,3 +1,4 @@ +pub mod bus; pub mod entities; pub mod grpc; pub mod rustlers; diff --git a/lib/rustlers/mod.rs b/lib/rustlers/mod.rs index da5b1a1..3e46eaf 100644 --- a/lib/rustlers/mod.rs +++ b/lib/rustlers/mod.rs @@ -1,6 +1,5 @@ mod rustler; -pub mod bus; pub mod rustlerjar; pub mod svc; pub use rustler::*; diff --git a/lib/rustlers/rustler.rs b/lib/rustlers/rustler.rs index 22c1fbe..77d5955 100644 --- a/lib/rustlers/rustler.rs +++ b/lib/rustlers/rustler.rs @@ -2,11 +2,11 @@ pub extern crate chrono; pub extern crate eyre; use { - super::{ + super::svc::RustlerMsg, + crate::{ bus::{BusMessage, ToBusKey, ToBusVal, ToFromBusMessage}, - svc::RustlerMsg, + entities::{market, ticker}, }, - crate::entities::{market, ticker}, async_trait::async_trait, chrono::{DateTime, Local}, eyre::Result, diff --git a/lib/rustlers/svc.rs b/lib/rustlers/svc.rs index e092441..f4958c4 100644 --- a/lib/rustlers/svc.rs +++ b/lib/rustlers/svc.rs @@ -5,8 +5,9 @@ use { MarketHourType, }, crate::{ + bus::PublisherTrait, entities::{market, sea_orm::DatabaseConnection, ticker}, - rustlers::{bus::PublisherTrait, Quote}, + rustlers::Quote, }, eyre::Result, lool::{ diff --git a/🐎 rustler-core.code-workspace b/🐎 rustler-core.code-workspace index 0726f56..b119467 100644 --- a/🐎 rustler-core.code-workspace +++ b/🐎 rustler-core.code-workspace @@ -17,7 +17,7 @@ { "name": "redis", "base": "database", - "color": "deep-orange-400", + "color": "red-400", "folderNames": ["redis"] }, {