refactotr: dont use modelr eader block

dojoengine · Nov 14, 2024 · 155033d · 155033d
1 parent cea8102
commit 155033d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/crates/torii/core/src/processors/register_event.rs b/crates/torii/core/src/processors/register_event.rs
@@ -3,7 +3,7 @@ use async_trait::async_trait;
 use dojo_world::contracts::abigen::world::Event as WorldEvent;
 use dojo_world::contracts::model::ModelReader;
 use dojo_world::contracts::world::WorldContractReader;
-use starknet::core::types::{BlockId, Event};
+use starknet::core::types::Event;
 use starknet::providers::Provider;
 use tracing::{debug, info};
 
@@ -34,7 +34,7 @@ where
         &self,
         world: &WorldContractReader<P>,
         db: &mut Sql,
-        block_number: u64,
+        _block_number: u64,
         block_timestamp: u64,
         _event_id: &str,
         event: &Event,
@@ -60,8 +60,7 @@ where
 
         // Called model here by language, but it's an event. Torii rework will make clear
         // distinction.
-        let model =
-            world.model_reader_with_block(&namespace, &name, BlockId::Number(block_number)).await?;
+        let model = world.model_reader(&namespace, &name).await?;
         let schema = model.schema().await?;
         let layout = model.layout().await?;
 

diff --git a/crates/torii/core/src/processors/register_model.rs b/crates/torii/core/src/processors/register_model.rs
@@ -3,7 +3,7 @@ use async_trait::async_trait;
 use dojo_world::contracts::abigen::world::Event as WorldEvent;
 use dojo_world::contracts::model::ModelReader;
 use dojo_world::contracts::world::WorldContractReader;
-use starknet::core::types::{BlockId, Event};
+use starknet::core::types::Event;
 use starknet::providers::Provider;
 use tracing::{debug, info};
 
@@ -34,7 +34,7 @@ where
         &self,
         world: &WorldContractReader<P>,
         db: &mut Sql,
-        block_number: u64,
+        _block_number: u64,
         block_timestamp: u64,
         _event_id: &str,
         event: &Event,
@@ -58,8 +58,7 @@ where
         let namespace = event.namespace.to_string().unwrap();
         let name = event.name.to_string().unwrap();
 
-        let model =
-            world.model_reader_with_block(&namespace, &name, BlockId::Number(block_number)).await?;
+        let model = world.model_reader(&namespace, &name).await?;
         let schema = model.schema().await?;
         let layout = model.layout().await?;