Reexport tetplaplets (#52)

This commit is contained in:
vms
2020-12-21 19:34:25 +03:00
committed by GitHub
parent 2af7a7297b
commit a039973835
37 changed files with 90 additions and 88 deletions

116
Cargo.lock generated
View File

@ -35,9 +35,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.35"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c0df63cb2955042487fad3aefd2c6e3ae7389ac5dc1beb28921de0b69f779d4"
checksum = "68803225a7b13e47191bab76f2687382b60d259e8cf37f6e1893658b84bb9479"
[[package]]
name = "aquamarine-vm"
@ -54,7 +54,7 @@ dependencies = [
name = "arguments-passing-test"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.11",
"safe-transmute",
]
@ -68,7 +68,7 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544"
name = "arrays-passing-test"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.11",
"safe-transmute",
]
@ -185,7 +185,7 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38"
name = "call_parameters"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
]
[[package]]
@ -407,7 +407,7 @@ dependencies = [
name = "curl_adapter"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
"log",
]
@ -612,7 +612,7 @@ name = "facade"
version = "0.1.0"
dependencies = [
"anyhow",
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
"log",
]
@ -669,7 +669,7 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8165090ee52453a5c14bd42212bfc6516860c4aaa2315fd568c0198b46b52901"
dependencies = [
"fluence 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence 0.2.12",
]
[[package]]
@ -681,7 +681,7 @@ name = "fce-wit-generator"
version = "0.1.11"
dependencies = [
"fce-wit-parser",
"fluence-sdk-wit 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-wit 0.2.12",
"once_cell",
"serde",
"serde_json",
@ -725,20 +725,20 @@ dependencies = [
[[package]]
name = "fluence"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "573e8c4ab833d4a69ce87cf1638256465940ebd062c22b3e12a22beb4527c3bb"
source = "git+https://github.com/fluencelabs/rust-sdk#aad0739cddca0356106e0039dae9b951e01ef227"
dependencies = [
"fluence-sdk-macro 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-main 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-macro 0.2.11",
"fluence-sdk-main 0.2.11",
]
[[package]]
name = "fluence"
version = "0.2.11"
source = "git+https://github.com/fluencelabs/rust-sdk#31dc0a30dfd05144439c63d3fc3aae93636de06c"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a3506e38cf0ff078c51ba86f778a5a6238bed0bed4457180171e15a5a6c3f1c"
dependencies = [
"fluence-sdk-macro 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence-sdk-main 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence-sdk-macro 0.2.12",
"fluence-sdk-main 0.2.12",
]
[[package]]
@ -763,7 +763,7 @@ dependencies = [
"env_logger 0.7.1",
"fce",
"fce-utils",
"fluence-sdk-main 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-main 0.2.12",
"itertools",
"log",
"once_cell",
@ -782,37 +782,37 @@ dependencies = [
[[package]]
name = "fluence-sdk-macro"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "348397aaa898e0bcd1554e71add917b400542684f0d416ef9cc8693da7daba48"
source = "git+https://github.com/fluencelabs/rust-sdk#aad0739cddca0356106e0039dae9b951e01ef227"
dependencies = [
"fluence-sdk-wit 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-wit 0.2.11",
]
[[package]]
name = "fluence-sdk-macro"
version = "0.2.11"
source = "git+https://github.com/fluencelabs/rust-sdk#31dc0a30dfd05144439c63d3fc3aae93636de06c"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f44e1668ecf3d45026bae6dd7a8e4045a9b1742a4f30db205954802e74cbcc4c"
dependencies = [
"fluence-sdk-wit 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence-sdk-wit 0.2.12",
]
[[package]]
name = "fluence-sdk-main"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fd4aa0aee4ae98fc74ef7e49800f6b0f5e7395e7b4f8a5758090e74d3d936e7d"
source = "git+https://github.com/fluencelabs/rust-sdk#aad0739cddca0356106e0039dae9b951e01ef227"
dependencies = [
"fluence-sdk-macro 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-macro 0.2.11",
"log",
"serde",
]
[[package]]
name = "fluence-sdk-main"
version = "0.2.11"
source = "git+https://github.com/fluencelabs/rust-sdk#31dc0a30dfd05144439c63d3fc3aae93636de06c"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71397005d09f96b188f33d1189d0fd2163fe54882b57979ddbdcdc28167e1107"
dependencies = [
"fluence-sdk-macro 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence-sdk-macro 0.2.12",
"log",
"serde",
]
@ -820,8 +820,7 @@ dependencies = [
[[package]]
name = "fluence-sdk-wit"
version = "0.2.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef3b20f7cd8ac6ee02a0ee7abd62f9339a236520430c0c702802149dc221555a"
source = "git+https://github.com/fluencelabs/rust-sdk#aad0739cddca0356106e0039dae9b951e01ef227"
dependencies = [
"proc-macro2",
"quote",
@ -833,8 +832,9 @@ dependencies = [
[[package]]
name = "fluence-sdk-wit"
version = "0.2.11"
source = "git+https://github.com/fluencelabs/rust-sdk#31dc0a30dfd05144439c63d3fc3aae93636de06c"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa333b56081139078aa62d9d5e6ac8ed5fb49578139788740742c1c7e1b4c112"
dependencies = [
"proc-macro2",
"quote",
@ -883,7 +883,7 @@ dependencies = [
"clap",
"env_logger 0.7.1",
"fluence-app-service",
"fluence-sdk-main 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence-sdk-main 0.2.12",
"itertools",
"log",
"rustop",
@ -1059,9 +1059,9 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04"
[[package]]
name = "heck"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac"
dependencies = [
"unicode-segmentation",
]
@ -1198,7 +1198,7 @@ dependencies = [
name = "inner-records-test"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.11",
"safe-transmute",
]
@ -1237,7 +1237,7 @@ dependencies = [
name = "ipfs-effector"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
"log",
]
@ -1245,7 +1245,7 @@ dependencies = [
name = "ipfs-pure"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
"log",
]
@ -1324,7 +1324,7 @@ checksum = "1482821306169ec4d07f6aca392a4681f66c75c9918aa49641a2595db64053cb"
name = "local_storage"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
"log",
]
@ -1772,9 +1772,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
version = "1.0.7"
version = "1.0.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37"
checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
dependencies = [
"proc-macro2",
]
@ -1860,7 +1860,7 @@ dependencies = [
name = "record-effector"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
"test-record",
]
@ -1868,7 +1868,7 @@ dependencies = [
name = "record-pure"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
"test-record",
]
@ -2187,9 +2187,9 @@ checksum = "ae524f056d7d770e174287294f562e95044c68e88dec909a00d2094805db9d75"
[[package]]
name = "socket2"
version = "0.3.18"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97e0e9fd577458a4f61fb91fcb559ea2afecc54c934119421f9f5d3d5b1a1057"
checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
dependencies = [
"cfg-if 1.0.0",
"libc",
@ -2205,9 +2205,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "stepper-interface"
version = "0.1.0"
source = "git+https://github.com/fluencelabs/aquamarine#0f9ec42b1ab161761f2c609ddc2c95bad5b3e696"
source = "git+https://github.com/fluencelabs/aquamarine?branch=wit#839008fb8b42abe4cab18f85db49766341a52326"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.11",
"serde",
"wasmer-interface-types-fl",
]
@ -2232,9 +2232,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "syn"
version = "1.0.54"
version = "1.0.55"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a2af957a63d6bd42255c359c93d9bfdb97076bd3b820897ce55ffbfbf107f44"
checksum = "a571a711dddd09019ccc628e1b17fe87c59b09d513c06c026877aa708334f37a"
dependencies = [
"proc-macro2",
"quote",
@ -2297,7 +2297,7 @@ dependencies = [
name = "test-record"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.11",
]
[[package]]
@ -2428,9 +2428,9 @@ dependencies = [
[[package]]
name = "toml"
version = "0.5.7"
version = "0.5.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "75cf45bb0bef80604d001caaec0d09da99611b3c0fd39d3080468875cdb65645"
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
dependencies = [
"serde",
]
@ -2753,7 +2753,7 @@ checksum = "7e7811dd7f9398f14cc76efd356f98f03aa30419dea46aa810d71e819fc97158"
name = "wasm-greeting"
version = "0.1.0"
dependencies = [
"fluence 0.2.11 (git+https://github.com/fluencelabs/rust-sdk)",
"fluence 0.2.12",
]
[[package]]
@ -2761,7 +2761,7 @@ name = "wasm-sqlite-test"
version = "0.1.0"
dependencies = [
"fce-sqlite-connector",
"fluence 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
"fluence 0.2.12",
]
[[package]]
@ -2818,9 +2818,9 @@ dependencies = [
[[package]]
name = "wasmer-interface-types-fl"
version = "0.17.19"
version = "0.17.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c01499babf417b51c28db8e735579d0645d89ee77a57f23492d61a610bb42b8"
checksum = "88dcf40c0c547e4d085c539070dc2c0caef364ccf5a11056f1de13659c65ea04"
dependencies = [
"log",
"nom",

View File

@ -12,7 +12,7 @@ path = "src/lib.rs"
[dependencies]
fluence-faas = { path = "../fluence-faas", version = "0.1.15" }
stepper-interface = { git = "https://github.com/fluencelabs/aquamarine", branch = "master" }
stepper-interface = { git = "https://github.com/fluencelabs/aquamarine", branch = "wit" }
maplit = "1.0.2"
serde_json = "1.0.57"

View File

@ -12,10 +12,10 @@ path = "src/lib.rs"
[dependencies]
fce-wit-parser = { path = "../wit-parser", version = "0.1.10"}
fluence-sdk-wit = "0.2.9"
fluence-sdk-wit = "=0.2.12"
walrus = "0.17.0"
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.19" }
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" }
once_cell = "1.4.0"
serde = { version = "1.0.110", features = ["derive"] }
serde_json = "1.0.56"

View File

@ -11,5 +11,5 @@ name = "fce_wit_interfaces"
path = "src/lib.rs"
[dependencies]
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.19" }
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" }
multimap = "0.8.1"

View File

@ -16,6 +16,6 @@ fce-wit-interfaces = { path = "../wit-interfaces", version = "0.1.8" }
anyhow = "1.0.31"
walrus = "0.17.0"
wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0"}
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.19" }
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" }
serde = "1.0.117"

View File

@ -18,7 +18,7 @@ fce-utils = { path = "../crates/utils", version = "0.1.0" }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc
wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["dynamicfunc-fat-closures"] }
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.19" }
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" }
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
multimap = "0.8.1"

View File

@ -9,4 +9,4 @@ name = "call_parameters"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk" }
fluence = "=0.2.12"

View File

@ -9,4 +9,4 @@ name = "greeting"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk" }
fluence = "=0.2.12"

View File

@ -9,5 +9,5 @@ name = "ipfs_effector"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"]}
fluence = { version = "=0.2.12", features = ["logger"]}
log = "0.4.11"

View File

@ -9,5 +9,5 @@ name = "ipfs_pure"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] }
fluence = { version = "=0.2.12", features = ["logger"]}
log = "0.4.11"

View File

@ -9,5 +9,5 @@ name = "records_effector"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] }
fluence = { version = "=0.2.12", features = ["logger"]}
test-record = { path = "../test-record" }

View File

@ -9,5 +9,5 @@ name = "records_pure"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] }
fluence = { version = "=0.2.12", features = ["logger"]}
test-record = { path = "../test-record" }

View File

@ -9,4 +9,4 @@ name = "test_record"
path = "src/test_record.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk" }
fluence = "=0.2.12"

View File

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

View File

@ -9,5 +9,5 @@ path = "src/main.rs"
name = "curl_adapter"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] }
fluence = { version = "=0.2.12", features = ["logger"]}
log = "0.4.8"

View File

@ -9,6 +9,6 @@ name = "facade"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"] }
fluence = { version = "=0.2.12", features = ["logger"]}
anyhow = "1.0.31"
log = "0.4.8"

View File

@ -9,5 +9,5 @@ name = "local_storage"
path = "src/main.rs"
[dependencies]
fluence = { git = "https://github.com/fluencelabs/rust-sdk", features = ["logger"]}
fluence = { version = "=0.2.12", features = ["logger"]}
log = "0.4.8"

View File

@ -66,3 +66,4 @@ pub use fluence_faas::from_interface_values;
pub use fluence_faas::vec1;
pub use fluence_faas::CallParameters;
pub use fluence_faas::SecurityTetraplet;

View File

@ -9,13 +9,13 @@ edition = "2018"
[dependencies]
fce = { path = "../engine", version = "0.1.13" }
fce-utils = { path = "../crates/utils", version = "0.1.0" }
fluence-sdk-main = { version = "=0.2.11", features = ["logger"] }
fluence-sdk-main = { version = "=0.2.12", features = ["logger"] }
wasmer-runtime = { package = "wasmer-runtime-fl", version = "0.17.0" }
# dynamicfunc-fat-closures allows using state inside DynamicFunc
wasmer-core = { package = "wasmer-runtime-core-fl", version = "0.17.0", features = ["dynamicfunc-fat-closures"] }
wasmer-wasi = { package = "wasmer-wasi-fl", version = "0.17.1" }
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.19" }
wasmer-wit = { package = "wasmer-interface-types-fl", version = "=0.17.20" }
toml = "0.5.6"
serde = { version = "1.0.111", features = ["derive"] }

View File

@ -69,5 +69,6 @@ pub use fce::from_interface_values;
pub use fce::vec1;
pub use fluence_sdk_main::CallParameters;
pub use fluence_sdk_main::SecurityTetraplet;
pub use wasmer_core::vm::Ctx;

View File

@ -39,17 +39,17 @@ pub fn call_parameters() {
let user_name = "root";
let application_id = "0x31337";
let result = faas
.call_with_ivalues(
"call_parameters",
"call_parameters",
&[],
fluence_sdk_main::CallParameters {
let tetraplet = fluence_sdk_main::SecurityTetraplet::default();
let call_parameters = fluence_sdk_main::CallParameters {
call_id: call_id.to_string(),
user_name: user_name.to_string(),
application_id: application_id.to_string(),
},
)
tetraplets: vec![vec![tetraplet]],
};
let result = faas
.call_with_ivalues("call_parameters", "call_parameters", &[], call_parameters)
.unwrap_or_else(|e| panic!("can't invoke call_parameters: {:?}", e));
assert_eq!(

View File

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