Skip to content

Commit baf0ce9

Browse files
authored
refactor(torii): fragment into different modules (#2856)
* refactor: start fragmenting torii * engine and qslite * use torii_sqlite in engine * rename to indexer * move tests to indexer * update all crates to use new fragmented torii * fmt * sotre update member * add back tests * fmt
1 parent eb65d81 commit baf0ce9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+425
-333
lines changed

Cargo.lock

Lines changed: 88 additions & 44 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ katana-trie = { path = "crates/katana/trie" }
119119
# torii
120120
torii-cli = { path = "crates/torii/cli" }
121121
torii-client = { path = "crates/torii/client" }
122-
torii-core = { path = "crates/torii/core" }
122+
torii-indexer = { path = "crates/torii/indexer" }
123+
torii-sqlite = { path = "crates/torii/sqlite" }
123124
torii-graphql = { path = "crates/torii/graphql" }
124125
torii-grpc = { path = "crates/torii/grpc" }
125126
torii-relay = { path = "crates/torii/libp2p" }

bin/torii/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ tokio-util = "0.7.7"
3636
tokio.workspace = true
3737
toml.workspace = true
3838
torii-cli.workspace = true
39-
torii-core.workspace = true
39+
torii-indexer.workspace = true
40+
torii-sqlite.workspace = true
4041
torii-graphql.workspace = true
4142
torii-grpc = { workspace = true, features = [ "server" ] }
4243
torii-relay.workspace = true

bin/torii/src/main.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@ use tempfile::{NamedTempFile, TempDir};
3131
use tokio::sync::broadcast;
3232
use tokio::sync::broadcast::Sender;
3333
use tokio_stream::StreamExt;
34-
use torii_core::engine::{Engine, EngineConfig, IndexingFlags, Processors};
35-
use torii_core::executor::Executor;
36-
use torii_core::processors::store_transaction::StoreTransactionProcessor;
37-
use torii_core::processors::EventProcessorConfig;
38-
use torii_core::simple_broker::SimpleBroker;
39-
use torii_core::sql::cache::ModelCache;
40-
use torii_core::sql::Sql;
41-
use torii_core::types::{Contract, ContractType, Model};
34+
use torii_indexer::engine::{Engine, EngineConfig, IndexingFlags, Processors};
35+
use torii_indexer::processors::store_transaction::StoreTransactionProcessor;
36+
use torii_indexer::processors::EventProcessorConfig;
4237
use torii_server::proxy::Proxy;
38+
use torii_sqlite::cache::ModelCache;
39+
use torii_sqlite::executor::Executor;
40+
use torii_sqlite::simple_broker::SimpleBroker;
41+
use torii_sqlite::types::{Contract, ContractType, Model};
42+
use torii_sqlite::Sql;
4343
use tracing::{error, info};
4444
use tracing_subscriber::{fmt, EnvFilter};
4545
use url::form_urlencoded;

crates/torii/cli/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ dojo-utils.workspace = true
1313
serde.workspace = true
1414
starknet.workspace = true
1515
toml.workspace = true
16-
torii-core.workspace = true
16+
torii-sqlite.workspace = true
1717
url.workspace = true
1818

1919
[dev-dependencies]

crates/torii/cli/src/args.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ mod test {
183183
use std::net::{IpAddr, Ipv4Addr};
184184
use std::str::FromStr;
185185

186-
use torii_core::types::{Contract, ContractType};
186+
use torii_sqlite::types::{Contract, ContractType};
187187

188188
use super::*;
189189

crates/torii/cli/src/options.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ use anyhow::Context;
55
use serde::ser::SerializeSeq;
66
use serde::{Deserialize, Serialize};
77
use starknet::core::types::Felt;
8-
use torii_core::types::{Contract, ContractType};
8+
use torii_sqlite::types::{Contract, ContractType};
99

1010
pub const DEFAULT_HTTP_ADDR: IpAddr = IpAddr::V4(Ipv4Addr::LOCALHOST);
1111
pub const DEFAULT_HTTP_PORT: u16 = 8080;

crates/torii/core/src/lib.rs

Lines changed: 0 additions & 12 deletions
This file was deleted.

crates/torii/core/src/utils.rs

Lines changed: 0 additions & 82 deletions
This file was deleted.

crates/torii/graphql/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ strum_macros.workspace = true
2828
thiserror.workspace = true
2929
tokio.workspace = true
3030
tokio-stream = "0.1.11"
31-
torii-core.workspace = true
31+
torii-sqlite.workspace = true
32+
torii-indexer.workspace = true
3233
tracing.workspace = true
3334
url.workspace = true
3435
warp.workspace = true

0 commit comments

Comments
 (0)