move start_block and world_address to engine config

dojoengine · Jul 29, 2023 · c921f76 · c921f76
1 parent e3bdc69
commit c921f76
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 18 deletions.
diff --git a/crates/torii/src/cli.rs b/crates/torii/src/cli.rs
@@ -46,8 +46,8 @@ struct Args {
     #[arg(short, long)]
     manifest: Option<Utf8PathBuf>,
     /// Specify a block to start indexing from, ignored if stored head exists
-    #[arg(short, long)]
-    start_block: Option<u64>,
+    #[arg(short, long, default_value = "0")]
+    start_block: u64,
 }
 
 #[tokio::main]

diff --git a/crates/torii/src/engine.rs b/crates/torii/src/engine.rs
@@ -31,20 +31,24 @@ impl<S: State, T: JsonRpcTransport + Sync + Send> Default for Processors<S, T> {
 #[derive(Debug)]
 pub struct EngineConfig {
     pub block_time: Duration,
+    pub world_address: FieldElement,
+    pub start_block: u64,
 }
 
 impl Default for EngineConfig {
     fn default() -> Self {
-        Self { block_time: Duration::from_secs(1) }
+        Self {
+            block_time: Duration::from_secs(1),
+            world_address: FieldElement::ZERO,
+            start_block: 0,
+        }
     }
 }
 
 pub struct Engine<'a, S: State + Executable, T: JsonRpcTransport + Sync + Send> {
     storage: &'a S,
     provider: &'a JsonRpcClient<T>,
     processors: Processors<S, T>,
-    world_address: FieldElement,
-    start_block: Option<u64>,
     config: EngineConfig,
 }
 
@@ -53,23 +57,22 @@ impl<'a, S: State + Executable, T: JsonRpcTransport + Sync + Send> Engine<'a, S,
         storage: &'a S,
         provider: &'a JsonRpcClient<T>,
         processors: Processors<S, T>,
-        world_address: FieldElement,
-        start_block: Option<u64>,
         config: EngineConfig,
     ) -> Self {
-        Self { storage, provider, processors, world_address, start_block, config }
+        Self { storage, provider, processors, config }
     }
 
     pub async fn start(&self) -> Result<(), Box<dyn Error>> {
         let storage_head = self.storage.head().await?;
 
-        let mut current_block_number = match (storage_head, self.start_block) {
-            (0, Some(start_block)) => start_block,
-            (_, Some(_)) => {
-                warn!("start block ignored, stored head exists and will be used instead");
+        let mut current_block_number = match storage_head {
+            0 => self.config.start_block,
+            _ => {
+                if self.config.start_block != 0 {
+                    warn!("start block ignored, stored head exists and will be used instead");
+                }
                 storage_head
             }
-            (_, None) => storage_head,
         };
 
         loop {
@@ -158,7 +161,7 @@ impl<'a, S: State + Executable, T: JsonRpcTransport + Sync + Send> Engine<'a, S,
 
             if let TransactionReceipt::Invoke(invoke_receipt) = receipt.clone() {
                 for event in &invoke_receipt.events {
-                    if event.from_address != self.world_address {
+                    if event.from_address != self.config.world_address {
                         info!("event not from world address, skipping");
                         continue;
                     }

diff --git a/crates/torii/src/indexer.rs b/crates/torii/src/indexer.rs
@@ -24,15 +24,13 @@ impl<'a, S: State + Executable, T: JsonRpcTransport + Sync + Send> Indexer<'a, S
         processors: Processors<S, T>,
         manifest: Manifest,
         world_address: FieldElement,
-        start_block: Option<u64>,
+        start_block: u64,
     ) -> Self {
         let engine = Engine::new(
             storage,
             provider,
             processors,
-            world_address,
-            start_block,
-            EngineConfig::default(),
+            EngineConfig { world_address, start_block, ..Default::default() },
         );
         Self { storage, provider, engine, manifest }
     }