return data instead of script; update binary

This commit is contained in:
vms 2020-09-22 16:27:33 +03:00
parent 871852d422
commit 0bba055ad5
7 changed files with 15 additions and 27 deletions

1
.gitignore vendored
View File

@ -1,3 +1,4 @@
.idea/ .idea/
/target /target
.DS_Store
.repl_history .repl_history

View File

@ -1,4 +0,0 @@
#V2
interface
call aquamarine invoke ["asd", ["a", "b"]]
call aquamarine invoke ["asd", "a"]

19
Cargo.lock generated
View File

@ -16,26 +16,22 @@ checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
[[package]] [[package]]
name = "fluence" name = "fluence"
version = "0.2.4" version = "0.2.6"
source = "git+https://github.com/fluencelabs/rust-sdk#75f4baaa905255b240d191880aeeed3e7ec1ad4f"
dependencies = [ dependencies = [
"fluence-sdk-macro", "fluence-sdk-macro",
"fluence-sdk-main", "fluence-sdk-main",
"safe-transmute",
] ]
[[package]] [[package]]
name = "fluence-sdk-macro" name = "fluence-sdk-macro"
version = "0.2.4" version = "0.2.6"
source = "git+https://github.com/fluencelabs/rust-sdk#75f4baaa905255b240d191880aeeed3e7ec1ad4f"
dependencies = [ dependencies = [
"fluence-sdk-wit", "fluence-sdk-wit",
] ]
[[package]] [[package]]
name = "fluence-sdk-main" name = "fluence-sdk-main"
version = "0.2.4" version = "0.2.6"
source = "git+https://github.com/fluencelabs/rust-sdk#75f4baaa905255b240d191880aeeed3e7ec1ad4f"
dependencies = [ dependencies = [
"fluence-sdk-macro", "fluence-sdk-macro",
"log", "log",
@ -44,8 +40,7 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-wit" name = "fluence-sdk-wit"
version = "0.2.4" version = "0.2.6"
source = "git+https://github.com/fluencelabs/rust-sdk#75f4baaa905255b240d191880aeeed3e7ec1ad4f"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -158,12 +153,6 @@ version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "safe-transmute"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "50b8b2cd387f744f69469aaed197954ba4c0ecdb31e02edf99b023e0df11178a"
[[package]] [[package]]
name = "serde" name = "serde"
version = "1.0.116" version = "1.0.116"

View File

@ -9,5 +9,5 @@ name = "aquamarine"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] } fluence = { path = "/Users/mike/dev/work/fluence/wasm/rust-sdk", features = ["logger"] }
log = "0.4.11" log = "0.4.11"

BIN
artifacts/aquamarine.wasm Executable file → Normal file

Binary file not shown.

View File

@ -134,7 +134,6 @@ ITERATORS
*/ */
/* /*
Addressing: Addressing:
@ -159,4 +158,4 @@ If !fn_srv_id && !pk_srv_id <- error
(call (current) (fn "resolve" "by_pk") [pk]) (call (current) (fn "resolve" "by_pk") [pk])
*/ */

View File

@ -24,17 +24,20 @@ pub fn main() {
#[fce] #[fce]
pub struct StepperOutcome { pub struct StepperOutcome {
pub aqua: String, pub data: String,
pub next_peer_pks: Vec<String>, pub next_peer_pks: Vec<String>,
} }
#[fce] #[fce]
pub fn invoke(init_user_id: String, aqua: String) -> StepperOutcome { pub fn invoke(init_user_id: String, aqua: String, data: String) -> StepperOutcome {
info!("stepper invoked with user_id = {}, aqua = {:?}", init_user_id, aqua); info!(
"stepper invoked with user_id = {}, aqua = {:?}, data = {:?}",
init_user_id, aqua, data
);
let outcome = StepperOutcome { let outcome = StepperOutcome {
aqua, data,
next_peer_pks: vec![init_user_id] next_peer_pks: vec![init_user_id],
}; };
outcome outcome