fluencelabs/marine
1
0
Fork 0
mirror of https://github.com/fluencelabs/marine.git synced 2024-12-12 06:45:32 +00:00
Code Issues Projects Releases Wiki Activity

update sdk to 0.2.13 (#53)

Browse Source
This commit is contained in:
vms 2020-12-22 16:06:49 +03:00 committed by GitHub
parent 20092f8174
commit b342859164
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 81 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Cargo.lock generated
View File

@ -54,7 +54,7 @@ dependencies = [
name = "arguments-passing-test" name = "arguments-passing-test"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
"safe-transmute", "safe-transmute",
] ]
@ -68,7 +68,7 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
name = "arrays-passing-test" name = "arrays-passing-test"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
"safe-transmute", "safe-transmute",
] ]
@ -185,7 +185,7 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
name = "call_parameters" name = "call_parameters"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -407,7 +407,7 @@ dependencies = [
name = "curl_adapter" name = "curl_adapter"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"log", "log",
] ]
@ -612,7 +612,7 @@ name = "facade"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"log", "log",
] ]
@ -669,7 +669,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8165090ee52453a5c14bd42212bfc6516860c4aaa2315fd568c0198b46b52901" checksum = "8165090ee52453a5c14bd42212bfc6516860c4aaa2315fd568c0198b46b52901"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -681,7 +681,7 @@ name = "fce-wit-generator"
version = "0.1.12" version = "0.1.12"
dependencies = [ dependencies = [
"fce-wit-parser", "fce-wit-parser",
"fluence-sdk-wit 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-sdk-wit 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"once_cell", "once_cell",
"serde", "serde",
"serde_json", "serde_json",
@ -724,21 +724,21 @@ dependencies = [
[[package]] [[package]]
name = "fluence" name = "fluence"
version = "0.2.12" version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a3506e38cf0ff078c51ba86f778a5a6238bed0bed4457180171e15a5a6c3f1c" checksum = "083f40a5d000b28b74f10d824925eccf1fbdf6dbb8881e6d052c6183b2bc615e"
dependencies = [ dependencies = [
"fluence-sdk-macro 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-sdk-macro 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-main 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-sdk-main 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "fluence" name = "fluence"
version = "0.2.12" version = "0.2.13"
source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802"
dependencies = [ dependencies = [
"fluence-sdk-macro 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence-sdk-macro 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence-sdk-main 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence-sdk-main 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
] ]
[[package]] [[package]]
@ -763,7 +763,7 @@ dependencies = [
"env_logger 0.7.1", "env_logger 0.7.1",
"fce", "fce",
"fce-utils", "fce-utils",
"fluence-sdk-main 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-sdk-main 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools", "itertools",
"log", "log",
"once_cell", "once_cell",
@ -781,47 +781,47 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-macro" name = "fluence-sdk-macro"
version = "0.2.12" version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f44e1668ecf3d45026bae6dd7a8e4045a9b1742a4f30db205954802e74cbcc4c" checksum = "2f79abced6cdfdd7089b0accad0d9c760bf9d2e82ae1bec851383e061cb40790"
dependencies = [ dependencies = [
"fluence-sdk-wit 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-sdk-wit 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
name = "fluence-sdk-macro" name = "fluence-sdk-macro"
version = "0.2.12" version = "0.2.13"
source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802"
dependencies = [ dependencies = [
"fluence-sdk-wit 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence-sdk-wit 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
] ]
[[package]] [[package]]
name = "fluence-sdk-main" name = "fluence-sdk-main"
version = "0.2.12" version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71397005d09f96b188f33d1189d0fd2163fe54882b57979ddbdcdc28167e1107" checksum = "2348d5b5000012f9da835e52f7473e08dff6345e9beba2e80a91b801e48ac0b6"
dependencies = [ dependencies = [
"fluence-sdk-macro 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-sdk-macro 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"log", "log",
"serde", "serde",
] ]
[[package]] [[package]]
name = "fluence-sdk-main" name = "fluence-sdk-main"
version = "0.2.12" version = "0.2.13"
source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802"
dependencies = [ dependencies = [
"fluence-sdk-macro 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence-sdk-macro 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
"log", "log",
"serde", "serde",
] ]
[[package]] [[package]]
name = "fluence-sdk-wit" name = "fluence-sdk-wit"
version = "0.2.12" version = "0.2.13"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa333b56081139078aa62d9d5e6ac8ed5fb49578139788740742c1c7e1b4c112" checksum = "8da5f51cddeae52ff5b91d1a5d8be90e54629f4887f89f8d7501b829b374fe6a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -833,8 +833,8 @@ dependencies = [
[[package]] [[package]]
name = "fluence-sdk-wit" name = "fluence-sdk-wit"
version = "0.2.12" version = "0.2.13"
source = "git+https://github.com/fluencelabs/rust-sdk#a555291c1ceca0b9c959240e1d311d0e3309eda3" source = "git+https://github.com/fluencelabs/rust-sdk#71591f412cb65879d74e8c38838e827ab74d8802"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",
@ -883,7 +883,7 @@ dependencies = [
"clap", "clap",
"env_logger 0.7.1", "env_logger 0.7.1",
"fluence-app-service", "fluence-app-service",
"fluence-sdk-main 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence-sdk-main 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"itertools", "itertools",
"log", "log",
"rustop", "rustop",
@ -1198,7 +1198,7 @@ dependencies = [
name = "inner-records-test" name = "inner-records-test"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
"safe-transmute", "safe-transmute",
] ]
@ -1237,7 +1237,7 @@ dependencies = [
name = "ipfs-effector" name = "ipfs-effector"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"log", "log",
] ]
@ -1245,7 +1245,7 @@ dependencies = [
name = "ipfs-pure" name = "ipfs-pure"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"log", "log",
] ]
@ -1324,7 +1324,7 @@ checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
name = "local_storage" name = "local_storage"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"log", "log",
] ]
@ -1860,7 +1860,7 @@ dependencies = [
name = "record-effector" name = "record-effector"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"test-record", "test-record",
] ]
@ -1868,7 +1868,7 @@ dependencies = [
name = "record-pure" name = "record-pure"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
"test-record", "test-record",
] ]
@ -2207,7 +2207,7 @@ name = "stepper-interface"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/fluencelabs/aquamarine#b967a63abca9742d6764e9b27926025d5e2b2efb" source = "git+https://github.com/fluencelabs/aquamarine#b967a63abca9742d6764e9b27926025d5e2b2efb"
dependencies = [ dependencies = [
"fluence 0.2.12 (git+https://github.com/fluencelabs/rust-sdk)", "fluence 0.2.13 (git+https://github.com/fluencelabs/rust-sdk)",
"serde", "serde",
"wasmer-interface-types-fl", "wasmer-interface-types-fl",
] ]
@ -2297,7 +2297,7 @@ dependencies = [
name = "test-record" name = "test-record"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2753,7 +2753,7 @@ checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
name = "wasm-greeting" name = "wasm-greeting"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]
@ -2761,7 +2761,7 @@ name = "wasm-sqlite-test"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"fce-sqlite-connector", "fce-sqlite-connector",
"fluence 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "fluence 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]] [[package]]

2
crates/wit-generator/Cargo.toml
View File

@ -12,7 +12,7 @@ path = "src/lib.rs"
[dependencies] [dependencies]
fce-wit-parser = { path = "../wit-parser", version = "0.1.11"} fce-wit-parser = { path = "../wit-parser", version = "0.1.11"}
fluence-sdk-wit = "=0.2.12" fluence-sdk-wit = "=0.2.13"
walrus = "0.17.0" walrus = "0.17.0"
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" } wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" }

2
examples/call_parameters/Cargo.toml
View File

@ -9,4 +9,4 @@ name = "call_parameters"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = "=0.2.12" fluence = "=0.2.13"

BIN
examples/call_parameters/artifacts/call_parameters.wasm
View File

Binary file not shown.

10
examples/call_parameters/src/main.rs
View File

@ -22,5 +22,13 @@ pub fn main() {}
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
pub fn call_parameters() -> String { pub fn call_parameters() -> String {
let cp = fluence::get_call_parameters(); let cp = fluence::get_call_parameters();
format!("{}\n{}\n{}", cp.call_id, cp.user_name, cp.application_id) format!(
"{}\n{}\n{}\n{}\n{}\n{:?}",
cp.init_peer_id,
cp.service_id,
cp.service_creator_peer_id,
cp.host_id,
cp.particle_id,
cp.tetraplets
)
} }

2
examples/greeting/Cargo.toml
View File

@ -9,4 +9,4 @@ name = "greeting"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = "=0.2.12" fluence = "=0.2.13"

BIN
examples/greeting/artifacts/greeting.wasm
View File

Binary file not shown.

BIN
examples/ipfs-node/artifacts/ipfs_effector.wasm
View File

Binary file not shown.

BIN
examples/ipfs-node/artifacts/ipfs_pure.wasm
View File

Binary file not shown.

2
examples/ipfs-node/effector/Cargo.toml
View File

@ -9,5 +9,5 @@ name = "ipfs_effector"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { version = "=0.2.12", features = ["logger"]} fluence = { version = "=0.2.13", features = ["logger"]}
log = "0.4.11" log = "0.4.11"

2
examples/ipfs-node/pure/Cargo.toml
View File

@ -9,5 +9,5 @@ name = "ipfs_pure"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { version = "=0.2.12", features = ["logger"]} fluence = { version = "=0.2.13", features = ["logger"]}
log = "0.4.11" log = "0.4.11"

BIN
examples/records/artifacts/records_effector.wasm
View File

Binary file not shown.

BIN
examples/records/artifacts/records_pure.wasm
View File

Binary file not shown.

4
examples/records/effector/Cargo.toml
View File

@ -9,5 +9,5 @@ name = "records_effector"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { version = "=0.2.12", features = ["logger"]} fluence = { version = "=0.2.13", features = ["logger"]}
test-record = { path = "../test-record" } test-record = { path = "../test-record" }

2
examples/records/pure/Cargo.toml
View File

@ -9,5 +9,5 @@ name = "records_pure"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { version = "=0.2.12", features = ["logger"]} fluence = { version = "=0.2.13", features = ["logger"]}
test-record = { path = "../test-record" } test-record = { path = "../test-record" }

2
examples/records/test-record/Cargo.toml
View File

@ -9,4 +9,4 @@ name = "test_record"
path = "src/test_record.rs" path = "src/test_record.rs"
[dependencies] [dependencies]
fluence = "=0.2.12" fluence = "=0.2.13"

2
examples/sqlite/Cargo.toml
View File

@ -9,5 +9,5 @@ name = "sqlite_test"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = "=0.2.12" fluence = "=0.2.13"
fce-sqlite-connector = "=0.1.3" fce-sqlite-connector = "=0.1.3"

BIN
examples/sqlite/artifacts/sqlite_test.wasm
View File

Binary file not shown.

BIN
examples/url-downloader/artifacts/curl_adapter.wasm
View File

Binary file not shown.

BIN
examples/url-downloader/artifacts/facade.wasm
View File

Binary file not shown.

BIN
examples/url-downloader/artifacts/local_storage.wasm
View File

Binary file not shown.

2
examples/url-downloader/curl_adapter/Cargo.toml
View File

@ -9,5 +9,5 @@ path = "src/main.rs"
name = "curl_adapter" name = "curl_adapter"
[dependencies] [dependencies]
fluence = { version = "=0.2.12", features = ["logger"]} fluence = { version = "=0.2.13", features = ["logger"]}
log = "0.4.8" log = "0.4.8"

2
examples/url-downloader/facade/Cargo.toml
View File

@ -9,6 +9,6 @@ name = "facade"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { version = "=0.2.12", features = ["logger"]} fluence = { version = "=0.2.13", features = ["logger"]}
anyhow = "1.0.31" anyhow = "1.0.31"
log = "0.4.8" log = "0.4.8"

2
examples/url-downloader/local_storage/Cargo.toml
View File

@ -9,5 +9,5 @@ name = "local_storage"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = { version = "=0.2.12", features = ["logger"]} fluence = { version = "=0.2.13", features = ["logger"]}
log = "0.4.8" log = "0.4.8"

2
fluence-faas/Cargo.toml
View File

@ -9,7 +9,7 @@ edition = "2018"
[dependencies] [dependencies]
fce = { path = "../engine", version = "0.1.14" } fce = { path = "../engine", version = "0.1.14" }
fce-utils = { path = "../crates/utils", version = "0.1.0" } fce-utils = { path = "../crates/utils", version = "0.1.0" }
fluence-sdk-main = { version = "=0.2.12", features = ["logger"] } fluence-sdk-main = { version = "=0.2.13", features = ["logger"] }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" } wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc # dynamicfunc-fat-closures allows using state inside DynamicFunc

23
fluence-faas/tests/call_parameters.rs
View File

@ -35,17 +35,22 @@ pub fn call_parameters() {
let mut faas = FluenceFaaS::with_raw_config(call_parameters_config) let mut faas = FluenceFaaS::with_raw_config(call_parameters_config)
.unwrap_or_else(|e| panic!("can't create Fluence FaaS instance: {:?}", e)); .unwrap_or_else(|e| panic!("can't create Fluence FaaS instance: {:?}", e));
let call_id = "0x1337"; let init_peer_id = "init_peer_id";
let user_name = "root"; let service_id = "service_id";
let application_id = "0x31337"; let service_creator_peer_id = "service_creator_peer_id";
let host_id = "host_id";
let particle_id = "particle_id";
let tetraplet = fluence_sdk_main::SecurityTetraplet::default(); let tetraplet = fluence_sdk_main::SecurityTetraplet::default();
let tetraplets = vec![vec![tetraplet]];
let call_parameters = fluence_sdk_main::CallParameters { let call_parameters = fluence_sdk_main::CallParameters {
call_id: call_id.to_string(), init_peer_id: init_peer_id.to_string(),
user_name: user_name.to_string(), service_id: service_id.to_string(),
application_id: application_id.to_string(), service_creator_peer_id: service_creator_peer_id.to_string(),
tetraplets: vec![vec![tetraplet]], host_id: host_id.to_string(),
particle_id: particle_id.to_string(),
tetraplets: tetraplets.clone(),
}; };
let result = faas let result = faas
@ -55,8 +60,8 @@ pub fn call_parameters() {
assert_eq!( assert_eq!(
result, result,
vec![IValue::String(format!( vec![IValue::String(format!(
"{}\n{}\n{}", "{}\n{}\n{}\n{}\n{}\n{:?}",
call_id, user_name, application_id init_peer_id, service_id, service_creator_peer_id, host_id, particle_id, tetraplets
))] ))]
); );
} }

2
tools/repl/Cargo.toml
View File

@ -13,7 +13,7 @@ path = "src/main.rs"
[dependencies] [dependencies]
fluence-app-service = { path = "../../fluence-app-service", version = "0.1.16", features = ["raw-module-api"] } fluence-app-service = { path = "../../fluence-app-service", version = "0.1.16", features = ["raw-module-api"] }
fluence-sdk-main = { version = "=0.2.12", features = ["logger"] } fluence-sdk-main = { version = "=0.2.13", features = ["logger"] }
anyhow = "1.0.31" anyhow = "1.0.31"
clap = "2.33.1" clap = "2.33.1"