From 96fef1d8b50cf72734bd2b2332f5ec240b4814bb Mon Sep 17 00:00:00 2001
From: Yura Menshov <user344u@gmail.com>
Date: Thu, 26 Dec 2024 08:51:33 +0200
Subject: [PATCH 1/2] refactor how system.rs imports blocks

---
 lib/protoflow-blocks/src/lib.rs    | 19 ++++++++++++-------
 lib/protoflow-blocks/src/system.rs |  6 ++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/lib/protoflow-blocks/src/lib.rs b/lib/protoflow-blocks/src/lib.rs
index 41d1decd..7b5b08e9 100644
--- a/lib/protoflow-blocks/src/lib.rs
+++ b/lib/protoflow-blocks/src/lib.rs
@@ -31,13 +31,18 @@ pub use types::*;
 
 pub use protoflow_core::{SystemBuilding, SystemExecution};
 
-include!("blocks/core.rs"); // CoreBlocks
-include!("blocks/flow.rs"); // FlowBlocks
-include!("blocks/hash.rs"); // HashBlocks
-include!("blocks/io.rs"); // IoBlocks
-include!("blocks/math.rs"); // MathBlocks
-include!("blocks/sys.rs"); // SysBlocks
-include!("blocks/text.rs"); // TextBlocks
+pub mod blocks {
+    use super::*;
+
+    include!("blocks/core.rs"); // CoreBlocks
+    include!("blocks/flow.rs"); // FlowBlocks
+    include!("blocks/hash.rs"); // HashBlocks
+    include!("blocks/io.rs"); // IoBlocks
+    include!("blocks/math.rs"); // MathBlocks
+    include!("blocks/sys.rs"); // SysBlocks
+    include!("blocks/text.rs"); // TextBlocks
+}
+pub use blocks::*;
 
 pub trait AllBlocks:
     CoreBlocks + FlowBlocks + HashBlocks + IoBlocks + MathBlocks + SysBlocks + TextBlocks
diff --git a/lib/protoflow-blocks/src/system.rs b/lib/protoflow-blocks/src/system.rs
index 8d0da65a..b65ec22a 100644
--- a/lib/protoflow-blocks/src/system.rs
+++ b/lib/protoflow-blocks/src/system.rs
@@ -3,12 +3,10 @@
 #![allow(dead_code)]
 
 use crate::{
+    blocks::*,
     prelude::{fmt, Arc, Box, Bytes, FromStr, Rc, String, ToString},
     types::{DelayType, Encoding},
-    AllBlocks, Buffer, ConcatStrings, Const, CoreBlocks, Count, Decode, DecodeCsv, DecodeHex,
-    DecodeJson, Delay, Drop, Encode, EncodeCsv, EncodeHex, EncodeJson, FlowBlocks, HashBlocks,
-    IoBlocks, MathBlocks, Random, ReadDir, ReadEnv, ReadFile, ReadStdin, SplitString, SysBlocks,
-    TextBlocks, WriteFile, WriteStderr, WriteStdout,
+    AllBlocks, CoreBlocks, FlowBlocks, HashBlocks, IoBlocks, MathBlocks, SysBlocks, TextBlocks,
 };
 #[cfg(all(feature = "std", feature = "serde"))]
 use crate::{ReadSocket, WriteSocket};

From f8b6fa63fdf278a6a92c55e8071f09cb020916d1 Mon Sep 17 00:00:00 2001
From: Yura Menshov <user344u@gmail.com>
Date: Thu, 26 Dec 2024 09:08:34 +0200
Subject: [PATCH 2/2] trigger ci