refactor(repo): Change services to a specific folder (#395)

FuelLabs · Jan 27, 2025 · 176be19 · 176be19
1 parent c7ebb3a
commit 176be19
Show file tree

Hide file tree

Showing 181 changed files with 33 additions and 138 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -48,6 +48,7 @@ jobs:
             fuel-streams-store
             fuel-streams-types
             fuel-streams-test
+            fuel-web-utils
             sv-webserver
             sv-publisher
             sv-consumer

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -59,23 +59,27 @@ You can check the [./scripts/setup.sh](./scripts/setup.sh) file to see what is b
 Here's an overview of the project's directory structure:
 
 - `crates/`: Contains the main Rust crates for the project
-    - `fuel-data-parser/`: Utility library for encoding/decoding data
-    - `fuel-message-broker/`: Message broker implementation
+    - `data-parser/`: Utility library for encoding/decoding data
+    - `message-broker/`: Message broker implementation
     - `fuel-streams/`: Main fuel-streams package
-    - `fuel-streams-core/`: Core components for working with streams
-    - `fuel-streams-domains/`: Domain-specific implementations
-    - `fuel-streams-macros/`: Macro utilities for the project
-    - `fuel-streams-store/`: Storage implementations
-    - `fuel-streams-types/`: Common types and traits
-    - `fuel-streams-test/`: Testing utilities
-    - `sv-publisher/`: Publisher service implementation
-    - `sv-consumer/`: Consumer service implementation
-    - `sv-webserver/`: WebSocket server implementation
+    - `core/`: Core components for working with streams
+    - `domains/`: Domain-specific implementations
+    - `macros/`: Macro utilities for the project
+    - `store/`: Storage implementations
+    - `types/`: Common types and traits
+    - `web-utils/`: Web utilities
+    - `test/`: Testing utilities
+- `services/`: Contains the services for the project
+    - `publisher/`: Publisher service implementation
+    - `consumer/`: Consumer service implementation
+    - `webserver/`: WebSocket server implementation
 - `benches/`: Benchmarking code
 - `tests/`: Integration and end-to-end tests
 - `examples/`: Example code and usage demonstrations
 - `cluster/`: Kubernetes cluster configuration and deployment files
 - `scripts/`: Utility scripts for setup, deployment, and maintenance
+    - `generate-api-keys/`: Script for generating API keys
+    - `subjects-schema/`: Script for generating subjects schema
 
 ## 🧪 Running Tests
 
@@ -321,15 +325,16 @@ The scope field is mandatory and must be one of the following:
 
 **Service Packages:**
 
-- `sv-publisher`: Publisher service
-- `sv-consumer`: Consumer service
-- `sv-webserver`: WebSocket server
+- `publisher`: Publisher service
+- `consumer`: Consumer service
+- `webserver`: WebSocket server
 
 **Support Packages:**
 
 - `fuel-data-parser`: Data parser utilities
 - `fuel-message-broker`: Message broker implementation
 - `fuel-streams-test`: Testing utilities
+- `fuel-web-utils`: Web utilities
 
 **Repository:**
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -3,7 +3,7 @@ default-members = ["crates/fuel-streams"]
 members = [
   "benches/*",
   "crates/*",
-  "crates/fuel-streams-macros/subject-derive",
+  "crates/macros/subject-derive",
   "examples",
   "scripts/generate-api-keys",
   "scripts/subjects-schema",
@@ -98,17 +98,17 @@ fuel-tx = { version = "0.58.2" }
 fuel-vm = { version = "0.58.2" }
 
 # Internal dependencies
-fuel-data-parser = { version = "0.0.22", path = "crates/fuel-data-parser" }
-fuel-message-broker = { version = "0.0.22", path = "crates/fuel-message-broker" }
+fuel-data-parser = { version = "0.0.22", path = "crates/data-parser" }
+fuel-message-broker = { version = "0.0.22", path = "crates/message-broker" }
 fuel-streams = { version = "0.0.22", path = "crates/fuel-streams" }
-fuel-streams-core = { version = "0.0.22", path = "crates/fuel-streams-core" }
-fuel-streams-domains = { version = "0.0.22", path = "crates/fuel-streams-domains" }
-fuel-streams-macros = { version = "0.0.22", path = "crates/fuel-streams-macros" }
-fuel-streams-store = { version = "0.0.22", path = "crates/fuel-streams-store" }
-fuel-streams-test = { version = "0.0.22", path = "crates/fuel-streams-test" }
-fuel-streams-types = { version = "0.0.22", path = "crates/fuel-streams-types" }
-fuel-web-utils = { version = "0.0.22", path = "crates/fuel-web-utils" }
-subject-derive = { version = "0.0.22", path = "crates/fuel-streams-macros/subject-derive" }
+fuel-streams-core = { version = "0.0.22", path = "crates/core" }
+fuel-streams-domains = { version = "0.0.22", path = "crates/domains" }
+fuel-streams-macros = { version = "0.0.22", path = "crates/macros" }
+fuel-streams-store = { version = "0.0.22", path = "crates/store" }
+fuel-streams-test = { version = "0.0.22", path = "crates/test" }
+fuel-streams-types = { version = "0.0.22", path = "crates/types" }
+fuel-web-utils = { version = "0.0.22", path = "crates/web-utils" }
+subject-derive = { version = "0.0.22", path = "crates/macros/subject-derive" }
 
 # Workspace projects
 [workspace.metadata.cargo-machete]

diff --git a/Makefile b/Makefile
@@ -311,7 +311,7 @@ reset-nats: clean-nats start-nats
 
 setup-db:
 	@echo "Setting up database..."
-	@cargo sqlx migrate run --source crates/fuel-streams-store/migrations
+	@cargo sqlx migrate run --source crates/store/migrations
 	@cargo run --package generate-api-keys -- --nkeys 10
 	# I removed this for now because it was not working on CI
 	# @cargo sqlx prepare --workspace -- --all-features

diff --git a/crates/fuel-streams-core/Cargo.toml → crates/core/Cargo.toml b/crates/fuel-streams-core/Cargo.toml → crates/core/Cargo.toml
diff --git a/crates/fuel-streams-core/README.md → crates/core/README.md b/crates/fuel-streams-core/README.md → crates/core/README.md
diff --git a/crates/fuel-streams-core/src/lib.rs → crates/core/src/lib.rs b/crates/fuel-streams-core/src/lib.rs → crates/core/src/lib.rs
diff --git a/...streams-core/src/server/deliver_policy.rs → crates/core/src/server/deliver_policy.rs b/...streams-core/src/server/deliver_policy.rs → crates/core/src/server/deliver_policy.rs
diff --git a/crates/fuel-streams-core/src/server/mod.rs → crates/core/src/server/mod.rs b/crates/fuel-streams-core/src/server/mod.rs → crates/core/src/server/mod.rs
diff --git a/...l-streams-core/src/server/subscription.rs → crates/core/src/server/subscription.rs b/...l-streams-core/src/server/subscription.rs → crates/core/src/server/subscription.rs
diff --git a/...es/fuel-streams-core/src/stream/config.rs → crates/core/src/stream/config.rs b/...es/fuel-streams-core/src/stream/config.rs → crates/core/src/stream/config.rs
diff --git a/crates/fuel-streams-core/src/stream/error.rs → crates/core/src/stream/error.rs b/crates/fuel-streams-core/src/stream/error.rs → crates/core/src/stream/error.rs
diff --git a/...l-streams-core/src/stream/fuel_streams.rs → crates/core/src/stream/fuel_streams.rs b/...l-streams-core/src/stream/fuel_streams.rs → crates/core/src/stream/fuel_streams.rs
diff --git a/crates/fuel-streams-core/src/stream/mod.rs → crates/core/src/stream/mod.rs b/crates/fuel-streams-core/src/stream/mod.rs → crates/core/src/stream/mod.rs
diff --git a/...el-streams-core/src/stream/stream_impl.rs → crates/core/src/stream/stream_impl.rs b/...el-streams-core/src/stream/stream_impl.rs → crates/core/src/stream/stream_impl.rs
diff --git a/crates/fuel-data-parser/Cargo.toml → crates/data-parser/Cargo.toml b/crates/fuel-data-parser/Cargo.toml → crates/data-parser/Cargo.toml
diff --git a/crates/fuel-data-parser/README.md → crates/data-parser/README.md b/crates/fuel-data-parser/README.md → crates/data-parser/README.md
diff --git a/...data-parser/src/compression_strategies.rs → ...data-parser/src/compression_strategies.rs b/...data-parser/src/compression_strategies.rs → ...data-parser/src/compression_strategies.rs
diff --git a/crates/fuel-data-parser/src/error.rs → crates/data-parser/src/error.rs b/crates/fuel-data-parser/src/error.rs → crates/data-parser/src/error.rs
diff --git a/crates/fuel-data-parser/src/lib.rs → crates/data-parser/src/lib.rs b/crates/fuel-data-parser/src/lib.rs → crates/data-parser/src/lib.rs
diff --git a/crates/fuel-streams-domains/Cargo.toml → crates/domains/Cargo.toml b/crates/fuel-streams-domains/Cargo.toml → crates/domains/Cargo.toml
diff --git a/...uel-streams-domains/src/blocks/db_item.rs → crates/domains/src/blocks/db_item.rs b/...uel-streams-domains/src/blocks/db_item.rs → crates/domains/src/blocks/db_item.rs
diff --git a/...es/fuel-streams-domains/src/blocks/mod.rs → crates/domains/src/blocks/mod.rs b/...es/fuel-streams-domains/src/blocks/mod.rs → crates/domains/src/blocks/mod.rs
diff --git a/...uel-streams-domains/src/blocks/packets.rs → crates/domains/src/blocks/packets.rs b/...uel-streams-domains/src/blocks/packets.rs → crates/domains/src/blocks/packets.rs
diff --git a/...streams-domains/src/blocks/record_impl.rs → crates/domains/src/blocks/record_impl.rs b/...streams-domains/src/blocks/record_impl.rs → crates/domains/src/blocks/record_impl.rs
diff --git a/...el-streams-domains/src/blocks/subjects.rs → crates/domains/src/blocks/subjects.rs b/...el-streams-domains/src/blocks/subjects.rs → crates/domains/src/blocks/subjects.rs
diff --git a/.../fuel-streams-domains/src/blocks/types.rs → crates/domains/src/blocks/types.rs b/.../fuel-streams-domains/src/blocks/types.rs → crates/domains/src/blocks/types.rs
diff --git a/...uel-streams-domains/src/inputs/db_item.rs → crates/domains/src/inputs/db_item.rs b/...uel-streams-domains/src/inputs/db_item.rs → crates/domains/src/inputs/db_item.rs
diff --git a/...es/fuel-streams-domains/src/inputs/mod.rs → crates/domains/src/inputs/mod.rs b/...es/fuel-streams-domains/src/inputs/mod.rs → crates/domains/src/inputs/mod.rs
diff --git a/...uel-streams-domains/src/inputs/packets.rs → crates/domains/src/inputs/packets.rs b/...uel-streams-domains/src/inputs/packets.rs → crates/domains/src/inputs/packets.rs
diff --git a/...streams-domains/src/inputs/record_impl.rs → crates/domains/src/inputs/record_impl.rs b/...streams-domains/src/inputs/record_impl.rs → crates/domains/src/inputs/record_impl.rs
diff --git a/...el-streams-domains/src/inputs/subjects.rs → crates/domains/src/inputs/subjects.rs b/...el-streams-domains/src/inputs/subjects.rs → crates/domains/src/inputs/subjects.rs
diff --git a/.../fuel-streams-domains/src/inputs/types.rs → crates/domains/src/inputs/types.rs b/.../fuel-streams-domains/src/inputs/types.rs → crates/domains/src/inputs/types.rs
diff --git a/crates/fuel-streams-domains/src/lib.rs → crates/domains/src/lib.rs b/crates/fuel-streams-domains/src/lib.rs → crates/domains/src/lib.rs
diff --git a/...s/fuel-streams-domains/src/msg_payload.rs → crates/domains/src/msg_payload.rs b/...s/fuel-streams-domains/src/msg_payload.rs → crates/domains/src/msg_payload.rs
diff --git a/...el-streams-domains/src/outputs/db_item.rs → crates/domains/src/outputs/db_item.rs b/...el-streams-domains/src/outputs/db_item.rs → crates/domains/src/outputs/db_item.rs
diff --git a/...s/fuel-streams-domains/src/outputs/mod.rs → crates/domains/src/outputs/mod.rs b/...s/fuel-streams-domains/src/outputs/mod.rs → crates/domains/src/outputs/mod.rs
diff --git a/...el-streams-domains/src/outputs/packets.rs → crates/domains/src/outputs/packets.rs b/...el-streams-domains/src/outputs/packets.rs → crates/domains/src/outputs/packets.rs
diff --git a/...treams-domains/src/outputs/record_impl.rs → crates/domains/src/outputs/record_impl.rs b/...treams-domains/src/outputs/record_impl.rs → crates/domains/src/outputs/record_impl.rs
diff --git a/...l-streams-domains/src/outputs/subjects.rs → crates/domains/src/outputs/subjects.rs b/...l-streams-domains/src/outputs/subjects.rs → crates/domains/src/outputs/subjects.rs
diff --git a/...fuel-streams-domains/src/outputs/types.rs → crates/domains/src/outputs/types.rs b/...fuel-streams-domains/src/outputs/types.rs → crates/domains/src/outputs/types.rs
diff --git a/...l-streams-domains/src/receipts/db_item.rs → crates/domains/src/receipts/db_item.rs b/...l-streams-domains/src/receipts/db_item.rs → crates/domains/src/receipts/db_item.rs
diff --git a/.../fuel-streams-domains/src/receipts/mod.rs → crates/domains/src/receipts/mod.rs b/.../fuel-streams-domains/src/receipts/mod.rs → crates/domains/src/receipts/mod.rs
diff --git a/...l-streams-domains/src/receipts/packets.rs → crates/domains/src/receipts/packets.rs b/...l-streams-domains/src/receipts/packets.rs → crates/domains/src/receipts/packets.rs
diff --git a/...reams-domains/src/receipts/record_impl.rs → crates/domains/src/receipts/record_impl.rs b/...reams-domains/src/receipts/record_impl.rs → crates/domains/src/receipts/record_impl.rs
diff --git a/...-streams-domains/src/receipts/subjects.rs → crates/domains/src/receipts/subjects.rs b/...-streams-domains/src/receipts/subjects.rs → crates/domains/src/receipts/subjects.rs
diff --git a/...uel-streams-domains/src/receipts/types.rs → crates/domains/src/receipts/types.rs b/...uel-streams-domains/src/receipts/types.rs → crates/domains/src/receipts/types.rs
diff --git a/...el-streams-domains/src/subject_payload.rs → crates/domains/src/subject_payload.rs b/...el-streams-domains/src/subject_payload.rs → crates/domains/src/subject_payload.rs
diff --git a/crates/fuel-streams-domains/src/subjects.rs → crates/domains/src/subjects.rs b/crates/fuel-streams-domains/src/subjects.rs → crates/domains/src/subjects.rs
diff --git a/...reams-domains/src/transactions/db_item.rs → crates/domains/src/transactions/db_item.rs b/...reams-domains/src/transactions/db_item.rs → crates/domains/src/transactions/db_item.rs
diff --git a/...l-streams-domains/src/transactions/mod.rs → crates/domains/src/transactions/mod.rs b/...l-streams-domains/src/transactions/mod.rs → crates/domains/src/transactions/mod.rs
diff --git a/...reams-domains/src/transactions/packets.rs → crates/domains/src/transactions/packets.rs b/...reams-domains/src/transactions/packets.rs → crates/domains/src/transactions/packets.rs
diff --git a/...s-domains/src/transactions/record_impl.rs → ...s/domains/src/transactions/record_impl.rs b/...s-domains/src/transactions/record_impl.rs → ...s/domains/src/transactions/record_impl.rs
diff --git a/...eams-domains/src/transactions/subjects.rs → crates/domains/src/transactions/subjects.rs b/...eams-domains/src/transactions/subjects.rs → crates/domains/src/transactions/subjects.rs
diff --git a/...streams-domains/src/transactions/types.rs → crates/domains/src/transactions/types.rs b/...streams-domains/src/transactions/types.rs → crates/domains/src/transactions/types.rs
diff --git a/...fuel-streams-domains/src/utxos/db_item.rs → crates/domains/src/utxos/db_item.rs b/...fuel-streams-domains/src/utxos/db_item.rs → crates/domains/src/utxos/db_item.rs
diff --git a/crates/fuel-streams-domains/src/utxos/mod.rs → crates/domains/src/utxos/mod.rs b/crates/fuel-streams-domains/src/utxos/mod.rs → crates/domains/src/utxos/mod.rs
diff --git a/...fuel-streams-domains/src/utxos/packets.rs → crates/domains/src/utxos/packets.rs b/...fuel-streams-domains/src/utxos/packets.rs → crates/domains/src/utxos/packets.rs
diff --git a/...-streams-domains/src/utxos/record_impl.rs → crates/domains/src/utxos/record_impl.rs b/...-streams-domains/src/utxos/record_impl.rs → crates/domains/src/utxos/record_impl.rs
diff --git a/...uel-streams-domains/src/utxos/subjects.rs → crates/domains/src/utxos/subjects.rs b/...uel-streams-domains/src/utxos/subjects.rs → crates/domains/src/utxos/subjects.rs
diff --git a/...s/fuel-streams-domains/src/utxos/types.rs → crates/domains/src/utxos/types.rs b/...s/fuel-streams-domains/src/utxos/types.rs → crates/domains/src/utxos/types.rs
diff --git a/crates/fuel-streams-macros/Cargo.toml → crates/macros/Cargo.toml b/crates/fuel-streams-macros/Cargo.toml → crates/macros/Cargo.toml
diff --git a/crates/fuel-streams-macros/README.md → crates/macros/README.md b/crates/fuel-streams-macros/README.md → crates/macros/README.md
diff --git a/crates/fuel-streams-macros/src/lib.rs → crates/macros/src/lib.rs b/crates/fuel-streams-macros/src/lib.rs → crates/macros/src/lib.rs
diff --git a/...-streams-macros/subject-derive/Cargo.toml → crates/macros/subject-derive/Cargo.toml b/...-streams-macros/subject-derive/Cargo.toml → crates/macros/subject-derive/Cargo.toml
diff --git a/...l-streams-macros/subject-derive/README.md → crates/macros/subject-derive/README.md b/...l-streams-macros/subject-derive/README.md → crates/macros/subject-derive/README.md
diff --git a/...treams-macros/subject-derive/src/attrs.rs → crates/macros/subject-derive/src/attrs.rs b/...treams-macros/subject-derive/src/attrs.rs → crates/macros/subject-derive/src/attrs.rs
diff --git a/...reams-macros/subject-derive/src/fields.rs → crates/macros/subject-derive/src/fields.rs b/...reams-macros/subject-derive/src/fields.rs → crates/macros/subject-derive/src/fields.rs
diff --git a/...macros/subject-derive/src/into_subject.rs → ...macros/subject-derive/src/into_subject.rs b/...macros/subject-derive/src/into_subject.rs → ...macros/subject-derive/src/into_subject.rs
diff --git a/...-streams-macros/subject-derive/src/lib.rs → crates/macros/subject-derive/src/lib.rs b/...-streams-macros/subject-derive/src/lib.rs → crates/macros/subject-derive/src/lib.rs
diff --git a/...eams-macros/subject-derive/src/subject.rs → crates/macros/subject-derive/src/subject.rs b/...eams-macros/subject-derive/src/subject.rs → crates/macros/subject-derive/src/subject.rs
diff --git a/...el-streams-macros/tests/subject-derive.rs → crates/macros/tests/subject-derive.rs b/...el-streams-macros/tests/subject-derive.rs → crates/macros/tests/subject-derive.rs
diff --git a/crates/fuel-message-broker/Cargo.toml → crates/message-broker/Cargo.toml b/crates/fuel-message-broker/Cargo.toml → crates/message-broker/Cargo.toml
diff --git a/crates/fuel-message-broker/src/lib.rs → crates/message-broker/src/lib.rs b/crates/fuel-message-broker/src/lib.rs → crates/message-broker/src/lib.rs
diff --git a/crates/fuel-message-broker/src/msg_broker.rs → crates/message-broker/src/msg_broker.rs b/crates/fuel-message-broker/src/msg_broker.rs → crates/message-broker/src/msg_broker.rs
diff --git a/crates/fuel-message-broker/src/nats.rs → crates/message-broker/src/nats.rs b/crates/fuel-message-broker/src/nats.rs → crates/message-broker/src/nats.rs
diff --git a/...s/fuel-message-broker/src/nats_metrics.rs → crates/message-broker/src/nats_metrics.rs b/...s/fuel-message-broker/src/nats_metrics.rs → crates/message-broker/src/nats_metrics.rs
diff --git a/crates/fuel-message-broker/src/nats_opts.rs → crates/message-broker/src/nats_opts.rs b/crates/fuel-message-broker/src/nats_opts.rs → crates/message-broker/src/nats_opts.rs
diff --git a/crates/fuel-streams-store/Cargo.toml → crates/store/Cargo.toml b/crates/fuel-streams-store/Cargo.toml → crates/store/Cargo.toml
diff --git a/...ns/20250105033516_create_blocks_table.sql → ...ns/20250105033516_create_blocks_table.sql b/...ns/20250105033516_create_blocks_table.sql → ...ns/20250105033516_create_blocks_table.sql
diff --git a/...50108203444_create_transactions_table.sql → ...50108203444_create_transactions_table.sql b/...50108203444_create_transactions_table.sql → ...50108203444_create_transactions_table.sql
diff --git a/...ns/20250108203637_create_inputs_table.sql → ...ns/20250108203637_create_inputs_table.sql b/...ns/20250108203637_create_inputs_table.sql → ...ns/20250108203637_create_inputs_table.sql
diff --git a/...s/20250108204045_create_outputs_table.sql → ...s/20250108204045_create_outputs_table.sql b/...s/20250108204045_create_outputs_table.sql → ...s/20250108204045_create_outputs_table.sql
diff --git a/...ons/20250108204242_create_utxos_table.sql → ...ons/20250108204242_create_utxos_table.sql b/...ons/20250108204242_create_utxos_table.sql → ...ons/20250108204242_create_utxos_table.sql
diff --git a/.../20250108204327_create_receipts_table.sql → .../20250108204327_create_receipts_table.sql b/.../20250108204327_create_receipts_table.sql → .../20250108204327_create_receipts_table.sql
diff --git a/...ations/20250108206432_create_api_keys.sql → ...ations/20250108206432_create_api_keys.sql b/...ations/20250108206432_create_api_keys.sql → ...ations/20250108206432_create_api_keys.sql
diff --git a/...50125222835_change_subjects_to_unique.sql → ...50125222835_change_subjects_to_unique.sql b/...50125222835_change_subjects_to_unique.sql → ...50125222835_change_subjects_to_unique.sql
diff --git a/crates/fuel-streams-store/src/db/db_impl.rs → crates/store/src/db/db_impl.rs b/crates/fuel-streams-store/src/db/db_impl.rs → crates/store/src/db/db_impl.rs
diff --git a/crates/fuel-streams-store/src/db/db_item.rs → crates/store/src/db/db_item.rs b/crates/fuel-streams-store/src/db/db_item.rs → crates/store/src/db/db_item.rs
diff --git a/crates/fuel-streams-store/src/db/mod.rs → crates/store/src/db/mod.rs b/crates/fuel-streams-store/src/db/mod.rs → crates/store/src/db/mod.rs
diff --git a/crates/fuel-streams-store/src/lib.rs → crates/store/src/lib.rs b/crates/fuel-streams-store/src/lib.rs → crates/store/src/lib.rs
diff --git a/crates/fuel-streams-store/src/record/mod.rs → crates/store/src/record/mod.rs b/crates/fuel-streams-store/src/record/mod.rs → crates/store/src/record/mod.rs
diff --git a/...streams-store/src/record/query_options.rs → crates/store/src/record/query_options.rs b/...streams-store/src/record/query_options.rs → crates/store/src/record/query_options.rs
diff --git a/...streams-store/src/record/record_entity.rs → crates/store/src/record/record_entity.rs b/...streams-store/src/record/record_entity.rs → crates/store/src/record/record_entity.rs
diff --git a/...l-streams-store/src/record/record_impl.rs → crates/store/src/record/record_impl.rs b/...l-streams-store/src/record/record_impl.rs → crates/store/src/record/record_impl.rs
diff --git a/...streams-store/src/record/record_packet.rs → crates/store/src/record/record_packet.rs b/...streams-store/src/record/record_packet.rs → crates/store/src/record/record_packet.rs
diff --git a/...es/fuel-streams-store/src/store/errors.rs → crates/store/src/store/errors.rs b/...es/fuel-streams-store/src/store/errors.rs → crates/store/src/store/errors.rs
diff --git a/crates/fuel-streams-store/src/store/mod.rs → crates/store/src/store/mod.rs b/crates/fuel-streams-store/src/store/mod.rs → crates/store/src/store/mod.rs
diff --git a/...uel-streams-store/src/store/store_impl.rs → crates/store/src/store/store_impl.rs b/...uel-streams-store/src/store/store_impl.rs → crates/store/src/store/store_impl.rs
diff --git a/crates/fuel-streams-types/Cargo.toml → crates/types/Cargo.toml b/crates/fuel-streams-types/Cargo.toml → crates/types/Cargo.toml
diff --git a/crates/fuel-streams-types/src/fuel_core.rs → crates/types/src/fuel_core.rs b/crates/fuel-streams-types/src/fuel_core.rs → crates/types/src/fuel_core.rs
diff --git a/crates/fuel-streams-types/src/lib.rs → crates/types/src/lib.rs b/crates/fuel-streams-types/src/lib.rs → crates/types/src/lib.rs
diff --git a/...eams-types/src/primitives/block_height.rs → crates/types/src/primitives/block_height.rs b/...eams-types/src/primitives/block_height.rs → crates/types/src/primitives/block_height.rs
diff --git a/...uel-streams-types/src/primitives/bytes.rs → crates/types/src/primitives/bytes.rs b/...uel-streams-types/src/primitives/bytes.rs → crates/types/src/primitives/bytes.rs
diff --git a/...treams-types/src/primitives/bytes_long.rs → crates/types/src/primitives/bytes_long.rs b/...treams-types/src/primitives/bytes_long.rs → crates/types/src/primitives/bytes_long.rs
diff --git a/...el-streams-types/src/primitives/common.rs → crates/types/src/primitives/common.rs b/...el-streams-types/src/primitives/common.rs → crates/types/src/primitives/common.rs
diff --git a/...treams-types/src/primitives/identifier.rs → crates/types/src/primitives/identifier.rs b/...treams-types/src/primitives/identifier.rs → crates/types/src/primitives/identifier.rs
diff --git a/.../fuel-streams-types/src/primitives/mod.rs → crates/types/src/primitives/mod.rs b/.../fuel-streams-types/src/primitives/mod.rs → crates/types/src/primitives/mod.rs
diff --git a/...-types/src/primitives/script_execution.rs → .../types/src/primitives/script_execution.rs b/...-types/src/primitives/script_execution.rs → .../types/src/primitives/script_execution.rs
diff --git a/...treams-types/src/primitives/tx_pointer.rs → crates/types/src/primitives/tx_pointer.rs b/...treams-types/src/primitives/tx_pointer.rs → crates/types/src/primitives/tx_pointer.rs
diff --git a/...l-streams-types/src/primitives/utxo_id.rs → crates/types/src/primitives/utxo_id.rs b/...l-streams-types/src/primitives/utxo_id.rs → crates/types/src/primitives/utxo_id.rs
diff --git a/...reams-types/src/primitives/wrapper_int.rs → crates/types/src/primitives/wrapper_int.rs b/...reams-types/src/primitives/wrapper_int.rs → crates/types/src/primitives/wrapper_int.rs
diff --git a/crates/fuel-web-utils/Cargo.toml → crates/web-utils/Cargo.toml b/crates/fuel-web-utils/Cargo.toml → crates/web-utils/Cargo.toml
diff --git a/crates/fuel-web-utils/src/lib.rs → crates/web-utils/src/lib.rs b/crates/fuel-web-utils/src/lib.rs → crates/web-utils/src/lib.rs
diff --git a/crates/fuel-web-utils/src/server/api.rs → crates/web-utils/src/server/api.rs b/crates/fuel-web-utils/src/server/api.rs → crates/web-utils/src/server/api.rs
diff --git a/...uel-web-utils/src/server/http/handlers.rs → crates/web-utils/src/server/http/handlers.rs b/...uel-web-utils/src/server/http/handlers.rs → crates/web-utils/src/server/http/handlers.rs
diff --git a/crates/fuel-web-utils/src/server/http/mod.rs → crates/web-utils/src/server/http/mod.rs b/crates/fuel-web-utils/src/server/http/mod.rs → crates/web-utils/src/server/http/mod.rs
diff --git a/...erver/middlewares/api_key/api_key_impl.rs → ...erver/middlewares/api_key/api_key_impl.rs b/...erver/middlewares/api_key/api_key_impl.rs → ...erver/middlewares/api_key/api_key_impl.rs
diff --git a/.../src/server/middlewares/api_key/errors.rs → .../src/server/middlewares/api_key/errors.rs b/.../src/server/middlewares/api_key/errors.rs → .../src/server/middlewares/api_key/errors.rs
diff --git a/...src/server/middlewares/api_key/manager.rs → ...src/server/middlewares/api_key/manager.rs b/...src/server/middlewares/api_key/manager.rs → ...src/server/middlewares/api_key/manager.rs
diff --git a/.../server/middlewares/api_key/middleware.rs → .../server/middlewares/api_key/middleware.rs b/.../server/middlewares/api_key/middleware.rs → .../server/middlewares/api_key/middleware.rs
diff --git a/...ils/src/server/middlewares/api_key/mod.rs → ...ils/src/server/middlewares/api_key/mod.rs b/...ils/src/server/middlewares/api_key/mod.rs → ...ils/src/server/middlewares/api_key/mod.rs
diff --git a/...erver/middlewares/api_key/rate_limiter.rs → ...erver/middlewares/api_key/rate_limiter.rs b/...erver/middlewares/api_key/rate_limiter.rs → ...erver/middlewares/api_key/rate_limiter.rs
diff --git a/...src/server/middlewares/api_key/storage.rs → ...src/server/middlewares/api_key/storage.rs b/...src/server/middlewares/api_key/storage.rs → ...src/server/middlewares/api_key/storage.rs
diff --git a/...src/server/middlewares/api_key/user_id.rs → ...src/server/middlewares/api_key/user_id.rs b/...src/server/middlewares/api_key/user_id.rs → ...src/server/middlewares/api_key/user_id.rs
diff --git a/...l-web-utils/src/server/middlewares/mod.rs → ...s/web-utils/src/server/middlewares/mod.rs b/...l-web-utils/src/server/middlewares/mod.rs → ...s/web-utils/src/server/middlewares/mod.rs
diff --git a/...src/server/middlewares/password/errors.rs → ...src/server/middlewares/password/errors.rs b/...src/server/middlewares/password/errors.rs → ...src/server/middlewares/password/errors.rs
diff --git a/...rc/server/middlewares/password/manager.rs → ...rc/server/middlewares/password/manager.rs b/...rc/server/middlewares/password/manager.rs → ...rc/server/middlewares/password/manager.rs
diff --git a/...server/middlewares/password/middleware.rs → ...server/middlewares/password/middleware.rs b/...server/middlewares/password/middleware.rs → ...server/middlewares/password/middleware.rs
diff --git a/...ls/src/server/middlewares/password/mod.rs → ...ls/src/server/middlewares/password/mod.rs b/...ls/src/server/middlewares/password/mod.rs → ...ls/src/server/middlewares/password/mod.rs
diff --git a/crates/fuel-web-utils/src/server/mod.rs → crates/web-utils/src/server/mod.rs b/crates/fuel-web-utils/src/server/mod.rs → crates/web-utils/src/server/mod.rs
diff --git a/crates/fuel-web-utils/src/server/state.rs → crates/web-utils/src/server/state.rs b/crates/fuel-web-utils/src/server/state.rs → crates/web-utils/src/server/state.rs
diff --git a/crates/fuel-web-utils/src/shutdown.rs → crates/web-utils/src/shutdown.rs b/crates/fuel-web-utils/src/shutdown.rs → crates/web-utils/src/shutdown.rs
diff --git a/...web-utils/src/telemetry/elastic_search.rs → ...web-utils/src/telemetry/elastic_search.rs b/...web-utils/src/telemetry/elastic_search.rs → ...web-utils/src/telemetry/elastic_search.rs
diff --git a/...s/fuel-web-utils/src/telemetry/metrics.rs → crates/web-utils/src/telemetry/metrics.rs b/...s/fuel-web-utils/src/telemetry/metrics.rs → crates/web-utils/src/telemetry/metrics.rs
diff --git a/crates/fuel-web-utils/src/telemetry/mod.rs → crates/web-utils/src/telemetry/mod.rs b/crates/fuel-web-utils/src/telemetry/mod.rs → crates/web-utils/src/telemetry/mod.rs
diff --git a/...s/fuel-web-utils/src/telemetry/runtime.rs → crates/web-utils/src/telemetry/runtime.rs b/...s/fuel-web-utils/src/telemetry/runtime.rs → crates/web-utils/src/telemetry/runtime.rs
diff --git a/...es/fuel-web-utils/src/telemetry/system.rs → crates/web-utils/src/telemetry/system.rs b/...es/fuel-web-utils/src/telemetry/system.rs → crates/web-utils/src/telemetry/system.rs
diff --git a/crates/sv-consumer/Cargo.toml → services/consumer/Cargo.toml b/crates/sv-consumer/Cargo.toml → services/consumer/Cargo.toml
diff --git a/crates/sv-consumer/src/cli.rs → services/consumer/src/cli.rs b/crates/sv-consumer/src/cli.rs → services/consumer/src/cli.rs
diff --git a/crates/sv-consumer/src/errors.rs → services/consumer/src/errors.rs b/crates/sv-consumer/src/errors.rs → services/consumer/src/errors.rs
diff --git a/...v-consumer/src/executor/block_executor.rs → ...s/consumer/src/executor/block_executor.rs b/...v-consumer/src/executor/block_executor.rs → ...s/consumer/src/executor/block_executor.rs
diff --git a/...s/sv-consumer/src/executor/block_stats.rs → ...ices/consumer/src/executor/block_stats.rs b/...s/sv-consumer/src/executor/block_stats.rs → ...ices/consumer/src/executor/block_stats.rs
diff --git a/crates/sv-consumer/src/executor/mod.rs → services/consumer/src/executor/mod.rs b/crates/sv-consumer/src/executor/mod.rs → services/consumer/src/executor/mod.rs
diff --git a/...sv-consumer/src/executor/process_store.rs → ...es/consumer/src/executor/process_store.rs b/...sv-consumer/src/executor/process_store.rs → ...es/consumer/src/executor/process_store.rs
diff --git a/...v-consumer/src/executor/process_stream.rs → ...s/consumer/src/executor/process_stream.rs b/...v-consumer/src/executor/process_stream.rs → ...s/consumer/src/executor/process_stream.rs
diff --git a/crates/sv-consumer/src/executor/retry.rs → services/consumer/src/executor/retry.rs b/crates/sv-consumer/src/executor/retry.rs → services/consumer/src/executor/retry.rs
diff --git a/crates/sv-consumer/src/fuel_stores.rs → services/consumer/src/fuel_stores.rs b/crates/sv-consumer/src/fuel_stores.rs → services/consumer/src/fuel_stores.rs
diff --git a/crates/sv-consumer/src/lib.rs → services/consumer/src/lib.rs b/crates/sv-consumer/src/lib.rs → services/consumer/src/lib.rs
diff --git a/crates/sv-consumer/src/main.rs → services/consumer/src/main.rs b/crates/sv-consumer/src/main.rs → services/consumer/src/main.rs
diff --git a/crates/sv-consumer/src/server/metrics.rs → services/consumer/src/server/metrics.rs b/crates/sv-consumer/src/server/metrics.rs → services/consumer/src/server/metrics.rs
diff --git a/crates/sv-consumer/src/server/mod.rs → services/consumer/src/server/mod.rs b/crates/sv-consumer/src/server/mod.rs → services/consumer/src/server/mod.rs
diff --git a/crates/sv-consumer/src/server/state.rs → services/consumer/src/server/state.rs b/crates/sv-consumer/src/server/state.rs → services/consumer/src/server/state.rs
diff --git a/crates/sv-publisher/Cargo.toml → services/publisher/Cargo.toml b/crates/sv-publisher/Cargo.toml → services/publisher/Cargo.toml
diff --git a/crates/sv-publisher/src/cli.rs → services/publisher/src/cli.rs b/crates/sv-publisher/src/cli.rs → services/publisher/src/cli.rs
diff --git a/crates/sv-publisher/src/error.rs → services/publisher/src/error.rs b/crates/sv-publisher/src/error.rs → services/publisher/src/error.rs
diff --git a/crates/sv-publisher/src/lib.rs → services/publisher/src/lib.rs b/crates/sv-publisher/src/lib.rs → services/publisher/src/lib.rs
diff --git a/crates/sv-publisher/src/main.rs → services/publisher/src/main.rs b/crates/sv-publisher/src/main.rs → services/publisher/src/main.rs
diff --git a/crates/sv-publisher/src/metrics.rs → services/publisher/src/metrics.rs b/crates/sv-publisher/src/metrics.rs → services/publisher/src/metrics.rs
diff --git a/crates/sv-publisher/src/publish.rs → services/publisher/src/publish.rs b/crates/sv-publisher/src/publish.rs → services/publisher/src/publish.rs
diff --git a/crates/sv-publisher/src/recover.rs → services/publisher/src/recover.rs b/crates/sv-publisher/src/recover.rs → services/publisher/src/recover.rs
diff --git a/crates/sv-publisher/src/state.rs → services/publisher/src/state.rs b/crates/sv-publisher/src/state.rs → services/publisher/src/state.rs
diff --git a/crates/sv-webserver/Cargo.toml → services/webserver/Cargo.toml b/crates/sv-webserver/Cargo.toml → services/webserver/Cargo.toml
diff --git a/crates/sv-webserver/README.md → services/webserver/README.md b/crates/sv-webserver/README.md → services/webserver/README.md
diff --git a/crates/sv-webserver/src/cli.rs → services/webserver/src/cli.rs b/crates/sv-webserver/src/cli.rs → services/webserver/src/cli.rs
diff --git a/crates/sv-webserver/src/config.rs → services/webserver/src/config.rs b/crates/sv-webserver/src/config.rs → services/webserver/src/config.rs
diff --git a/crates/sv-webserver/src/lib.rs → services/webserver/src/lib.rs b/crates/sv-webserver/src/lib.rs → services/webserver/src/lib.rs
diff --git a/crates/sv-webserver/src/main.rs → services/webserver/src/main.rs b/crates/sv-webserver/src/main.rs → services/webserver/src/main.rs
diff --git a/crates/sv-webserver/src/metrics.rs → services/webserver/src/metrics.rs b/crates/sv-webserver/src/metrics.rs → services/webserver/src/metrics.rs
diff --git a/crates/sv-webserver/src/server/errors.rs → services/webserver/src/server/errors.rs b/crates/sv-webserver/src/server/errors.rs → services/webserver/src/server/errors.rs
diff --git a/...r/src/server/handlers/api_key_generate.rs → ...r/src/server/handlers/api_key_generate.rs b/...r/src/server/handlers/api_key_generate.rs → ...r/src/server/handlers/api_key_generate.rs
diff --git a/...s/sv-webserver/src/server/handlers/mod.rs → ...ices/webserver/src/server/handlers/mod.rs b/...s/sv-webserver/src/server/handlers/mod.rs → ...ices/webserver/src/server/handlers/mod.rs
diff --git a/...ebserver/src/server/handlers/websocket.rs → ...ebserver/src/server/handlers/websocket.rs b/...ebserver/src/server/handlers/websocket.rs → ...ebserver/src/server/handlers/websocket.rs
diff --git a/crates/sv-webserver/src/server/mod.rs → services/webserver/src/server/mod.rs b/crates/sv-webserver/src/server/mod.rs → services/webserver/src/server/mod.rs
diff --git a/crates/sv-webserver/src/server/state.rs → services/webserver/src/server/state.rs b/crates/sv-webserver/src/server/state.rs → services/webserver/src/server/state.rs
diff --git a/...webserver/src/server/websocket/decoder.rs → ...webserver/src/server/websocket/decoder.rs b/...webserver/src/server/websocket/decoder.rs → ...webserver/src/server/websocket/decoder.rs
diff --git a/.../sv-webserver/src/server/websocket/mod.rs → ...ces/webserver/src/server/websocket/mod.rs b/.../sv-webserver/src/server/websocket/mod.rs → ...ces/webserver/src/server/websocket/mod.rs
diff --git a/...webserver/src/server/websocket/session.rs → ...webserver/src/server/websocket/session.rs b/...webserver/src/server/websocket/session.rs → ...webserver/src/server/websocket/session.rs
diff --git a/...bserver/src/server/websocket/subscribe.rs → ...bserver/src/server/websocket/subscribe.rs b/...bserver/src/server/websocket/subscribe.rs → ...bserver/src/server/websocket/subscribe.rs
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
@@ -46,7 +46,7 @@ fuel-web-utils = { workspace = true, features = ["test-helpers"] }
 futures.workspace = true
 rand.workspace = true
 serde_json.workspace = true
-sv-consumer = { path = "../crates/sv-consumer", features = ["test-helpers"] }
+sv-consumer = { path = "../services/consumer", features = ["test-helpers"] }
 tokio = { workspace = true, features = [
   "macros",
   "rt-multi-thread",