refactor(torii-core): upgrade model silent if not in namespace (#2688)

dojoengine · Nov 14, 2024 · 51d80cf · 51d80cf
1 parent 6af7e92
commit 51d80cf
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 22 deletions.
diff --git a/crates/torii/core/src/processors/store_del_record.rs b/crates/torii/core/src/processors/store_del_record.rs
@@ -4,7 +4,7 @@ use dojo_world::contracts::abigen::world::Event as WorldEvent;
 use dojo_world::contracts::world::WorldContractReader;
 use starknet::core::types::Event;
 use starknet::providers::Provider;
-use tracing::info;
+use tracing::{debug, info};
 
 use super::{EventProcessor, EventProcessorConfig};
 use crate::sql::Sql;
@@ -55,12 +55,15 @@ where
         // This can happen if only specific namespaces are indexed.
         let model = match db.model(event.selector).await {
             Ok(m) => m,
-            Err(e) => {
-                if e.to_string().contains("no rows") {
-                    return Ok(());
-                }
-                return Err(e);
+            Err(e) if e.to_string().contains("no rows") => {
+                debug!(
+                    target: LOG_TARGET,
+                    selector = %event.selector,
+                    "Model does not exist, skipping."
+                );
+                return Ok(());
             }
+            Err(e) => return Err(e),
         };
 
         info!(

diff --git a/crates/torii/core/src/processors/store_set_record.rs b/crates/torii/core/src/processors/store_set_record.rs
@@ -4,7 +4,7 @@ use dojo_world::contracts::abigen::world::Event as WorldEvent;
 use dojo_world::contracts::world::WorldContractReader;
 use starknet::core::types::Event;
 use starknet::providers::Provider;
-use tracing::info;
+use tracing::{debug, info};
 
 use super::{EventProcessor, EventProcessorConfig};
 use crate::sql::utils::felts_to_sql_string;
@@ -56,12 +56,15 @@ where
         // This can happen if only specific namespaces are indexed.
         let model = match db.model(event.selector).await {
             Ok(m) => m,
-            Err(e) => {
-                if e.to_string().contains("no rows") {
-                    return Ok(());
-                }
-                return Err(e);
+            Err(e) if e.to_string().contains("no rows") => {
+                debug!(
+                    target: LOG_TARGET,
+                    selector = %event.selector,
+                    "Model does not exist, skipping."
+                );
+                return Ok(());
             }
+            Err(e) => return Err(e),
         };
 
         info!(

diff --git a/crates/torii/core/src/processors/store_update_record.rs b/crates/torii/core/src/processors/store_update_record.rs
@@ -5,7 +5,7 @@ use dojo_world::contracts::abigen::world::Event as WorldEvent;
 use dojo_world::contracts::world::WorldContractReader;
 use starknet::core::types::Event;
 use starknet::providers::Provider;
-use tracing::info;
+use tracing::{debug, info};
 
 use super::{EventProcessor, EventProcessorConfig};
 use crate::sql::Sql;
@@ -59,12 +59,15 @@ where
         // This can happen if only specific namespaces are indexed.
         let model = match db.model(event.selector).await {
             Ok(m) => m,
-            Err(e) => {
-                if e.to_string().contains("no rows") {
-                    return Ok(());
-                }
-                return Err(e);
+            Err(e) if e.to_string().contains("no rows") => {
+                debug!(
+                    target: LOG_TARGET,
+                    selector = %event.selector,
+                    "Model does not exist, skipping."
+                );
+                return Ok(());
             }
+            Err(e) => return Err(e),
         };
 
         info!(

diff --git a/crates/torii/core/src/processors/upgrade_event.rs b/crates/torii/core/src/processors/upgrade_event.rs
@@ -1,4 +1,4 @@
-use anyhow::{Error, Ok, Result};
+use anyhow::{Error, Result};
 use async_trait::async_trait;
 use dojo_world::contracts::abigen::world::Event as WorldEvent;
 use dojo_world::contracts::model::ModelReader;
@@ -56,7 +56,21 @@ where
 
         // Called model here by language, but it's an event. Torii rework will make clear
         // distinction.
-        let model = db.model(event.selector).await?;
+
+        // If the model does not exist, silently ignore it.
+        // This can happen if only specific namespaces are indexed.
+        let model = match db.model(event.selector).await {
+            Ok(m) => m,
+            Err(e) if e.to_string().contains("no rows") => {
+                debug!(
+                    target: LOG_TARGET,
+                    selector = %event.selector,
+                    "Model does not exist, skipping."
+                );
+                return Ok(());
+            }
+            Err(e) => return Err(e),
+        };
         let name = model.name;
         let namespace = model.namespace;
         let prev_schema = model.schema;

diff --git a/crates/torii/core/src/processors/upgrade_model.rs b/crates/torii/core/src/processors/upgrade_model.rs
@@ -1,4 +1,4 @@
-use anyhow::{Error, Ok, Result};
+use anyhow::{Error, Result};
 use async_trait::async_trait;
 use dojo_world::contracts::abigen::world::Event as WorldEvent;
 use dojo_world::contracts::model::ModelReader;
@@ -54,7 +54,21 @@ where
             }
         };
 
-        let model = db.model(event.selector).await?;
+        // If the model does not exist, silently ignore it.
+        // This can happen if only specific namespaces are indexed.
+        let model = match db.model(event.selector).await {
+            Ok(m) => m,
+            Err(e) if e.to_string().contains("no rows") => {
+                debug!(
+                    target: LOG_TARGET,
+                    selector = %event.selector,
+                    "Model does not exist, skipping."
+                );
+                return Ok(());
+            }
+            Err(e) => return Err(e),
+        };
+
         let name = model.name;
         let namespace = model.namespace;
         let prev_schema = model.schema;