Skip to content

Commit

Permalink
feat(spells): support -relay- for spell scripts [NET-374] (#1461)
Browse files Browse the repository at this point in the history
  • Loading branch information
justprosh committed Feb 13, 2023
1 parent 2978847 commit b7c3427
Show file tree
Hide file tree
Showing 2 changed files with 48 additions and 1 deletion.
39 changes: 38 additions & 1 deletion crates/particle-node-tests/tests/spells.rs
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ fn spell_args_test() {
let mut config = TriggerConfig::default();
config.clock.period_sec = 1;
config.clock.start_sec = 1;
let expected_value = json! ({"a": "b", "c": 1});
let expected_value = json!({"a": "b", "c": 1});
create_spell(
&mut client,
&script,
Expand Down Expand Up @@ -1007,6 +1007,7 @@ fn spell_peer_id_test() {

assert_eq!(result, scope_peer_id);
}

#[test]
fn spell_update_config() {
let swarms = make_swarms(1);
Expand Down Expand Up @@ -1245,3 +1246,39 @@ fn resolve_global_alias() {
assert_eq!(*resolved, tetraplets_service.id);
}
}

#[test]
fn spell_relay_id_test() {
let swarms = make_swarms(1);
let mut client = ConnectedClient::connect_to(swarms[0].multiaddr.clone())
.wrap_err("connect client")
.unwrap();

let script = format!(
r#"
(seq
(seq
(call %init_peer_id% ("getDataSrv" "-relay-") [] -relay-)
(call -relay- ("op" "identity") [-relay-] also_relay)
)
(call "{}" ("return" "") [also_relay])
)"#,
client.peer_id
);

let mut config = TriggerConfig::default();
config.clock.period_sec = 1;
config.clock.start_sec = 1;
create_spell(&mut client, &script, config, json!({}));

if let [JValue::String(relay_id)] = client
.receive_args()
.wrap_err("receive")
.unwrap()
.as_slice()
{
assert_eq!(*relay_id, client.node.to_base58());
} else {
panic!("expected one string result")
}
}
10 changes: 10 additions & 0 deletions sorcerer/src/sorcerer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use std::time::Duration;
use async_std::task::{spawn, JoinHandle};
use fluence_spell_dtos::trigger_config::TriggerConfigValue;
use futures::{FutureExt, StreamExt};
use serde_json::Value;

use aquamarine::AquamarineApi;
use fluence_libp2p::types::Inlet;
Expand Down Expand Up @@ -167,6 +168,7 @@ impl Sorcerer {

let mut get_data_srv = SpellBuiltin::new("getDataSrv");
get_data_srv.append("spell_id", self.make_get_spell_id_closure().into());
get_data_srv.append("-relay-", self.make_get_relay_closure().into());
get_data_srv.set_unhandled(self.make_get_spell_arg_closure().into());
spell_builtins.push(get_data_srv);

Expand Down Expand Up @@ -254,6 +256,14 @@ impl Sorcerer {
Box::new(move |_, params| async move { wrap(get_spell_id(params)) }.boxed())
}

fn make_get_relay_closure(&self) -> ServiceFunctionImmut {
let relay_peer_id = self.key_manager.get_host_peer_id().to_base58();
Box::new(move |_, _| {
let relay = relay_peer_id.clone();
async move { wrap(Ok(Value::String(relay))) }.boxed()
})
}

fn make_get_spell_arg_closure(&self) -> ServiceFunctionImmut {
let services = self.services.clone();
Box::new(move |args, params| {
Expand Down

0 comments on commit b7c3427

Please sign in to comment.