feat(spell): update to new mailbox [NET-505] (#1694)

fluencelabs · Jul 14, 2023 · 15f1921 · 15f1921
1 parent 453470d
commit 15f1921
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -88,8 +88,8 @@ particle-execution = { path = "particle-execution" }
 system-services = { path = "crates/system-services" }
 
 # spell
-fluence-spell-dtos = "=0.5.15"
-fluence-spell-distro = "=0.5.15"
+fluence-spell-dtos = "=0.5.16"
+fluence-spell-distro = "=0.5.16"
 
 # marine
 fluence-app-service = {version = "=0.26.4-feat-wasm-backend-interface-update-b3cf050-636-1.0", registry = "fluence"}

diff --git a/crates/nox-tests/tests/spells.rs b/crates/nox-tests/tests/spells.rs
@@ -901,7 +901,7 @@ async fn spell_timer_trigger_mailbox_test() {
         (seq
             (seq
                 (call %init_peer_id% ("getDataSrv" "spell_id") [] spell_id)
-                (call %init_peer_id% (spell_id "list_pop_string") ["trigger_mailbox"] trigger)
+                (call %init_peer_id% (spell_id "pop_mailbox") [] trigger)
             )
             (seq
                 (call %init_peer_id% ("json" "parse") [trigger.$.str] obj)
@@ -945,7 +945,7 @@ async fn spell_connection_pool_trigger_mailbox_test() {
                 (seq
                     (call %init_peer_id% ("getDataSrv" "spell_id") [] spell_id)
                     (seq
-                        (call %init_peer_id% (spell_id "list_pop_string") ["trigger_mailbox"] trigger)
+                        (call %init_peer_id% (spell_id "pop_mailbox") [] trigger)
                         (call %init_peer_id% ("run-console" "print") ["pop mailbox, trigger:" trigger])
                     )
                 )
@@ -1102,7 +1102,7 @@ async fn spell_update_config() {
         r#"(seq
             (seq
                 (call %init_peer_id% ("getDataSrv" "spell_id") [] spell_id)
-                (call %init_peer_id% (spell_id "list_pop_string") ["trigger_mailbox"] result)
+                (call %init_peer_id% (spell_id "pop_mailbox") [] result)
              )
             (call "{}" ("return" "") [result])
         )"#,
@@ -1194,7 +1194,7 @@ async fn spell_update_config_stopped_spell() {
         r#"(seq
             (seq
                 (call %init_peer_id% ("getDataSrv" "spell_id") [] spell_id)
-                (call %init_peer_id% (spell_id "list_pop_string") ["trigger_mailbox"] result)
+                (call %init_peer_id% (spell_id "pop_mailbox") [] result)
              )
             (call "{}" ("return" "") [result])
         )"#,

diff --git a/sorcerer/src/script_executor.rs b/sorcerer/src/script_executor.rs
@@ -133,15 +133,32 @@ impl Sorcerer {
         let func_outcome = self.services.call_function(
             worker_id,
             &event.spell_id,
-            "list_push_string",
-            vec![json!("trigger_mailbox"), json!(serialized_event)],
+            "push_mailbox",
+            vec![json!(serialized_event)],
             None,
             worker_id,
             self.spell_script_particle_ttl,
         );
 
-        process_func_outcome::<UnitValue>(func_outcome, &event.spell_id, "list_push_string")
-            .map(drop)
+        match process_func_outcome::<UnitValue>(func_outcome, &event.spell_id, "push_mailbox") {
+            Ok(_) => Ok(()),
+            Err(err) => {
+                log::warn!("Error on push_mailbox for spell {}: {}. Trying a fallback with list_push_string", event.spell_id, err);
+
+                // fallback for older spell versions
+                let func_outcome = self.services.call_function(
+                    worker_id,
+                    &event.spell_id,
+                    "list_push_string",
+                    vec![json!("trigger_mailbox"), json!(serialized_event)],
+                    None,
+                    worker_id,
+                    self.spell_script_particle_ttl,
+                );
+                process_func_outcome::<UnitValue>(func_outcome, &event.spell_id, "list_push_string")
+                    .map(drop)
+            }
+        }
     }
 
     pub async fn execute_script(&self, event: TriggerEvent) {