fluencelabs/examples
1
0
Fork 0
mirror of https://github.com/fluencelabs/examples synced 2025-04-25 10:42:16 +00:00
Code Issues Projects Releases Wiki Activity

update to marine, marine-test, bump versions

Browse Source
This commit is contained in:
boneyard93501 2021-06-13 15:06:43 -05:00
parent 1fc1cfffd7
commit 460fb44e3e
14 changed files with 109 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
echo-greeter/configs/Config.toml
View File

@ -1,4 +1,4 @@
modules_dir = "/Users/bebo/localdev/fluence-examples/par-greeter/artifacts/"
modules_dir = "./artifacts"
[[module]]
name = "echo_service"

80
echo-greeter/echo-service/Cargo.lock generated
View File

@ -33,62 +33,29 @@ dependencies = [
"log",
]
[[package]]
name = "fce-timestamp-macro"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0"
dependencies = [
"chrono",
"quote",
]
[[package]]
name = "fluence"
version = "0.6.2"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b731bd4a69a3945186f2ff96ff753908939c8a2debd60e1f0e8edb6a28757f8"
checksum = "88b09e1cd11a51ba4d169db347d009fe41ece2714eef4d5df720343733a1d5a6"
dependencies = [
"fce-timestamp-macro",
"fluence-sdk-macro",
"fluence-sdk-main",
"marine-macro",
"marine-timestamp-macro",
"serde",
]
[[package]]
name = "fluence-sdk-macro"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde"
dependencies = [
"fluence-sdk-wit",
]
[[package]]
name = "fluence-sdk-main"
version = "0.6.1"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604"
checksum = "68d93cde99e1494e11755a39b93863333397245c9959c774fe3bebd9e4143879"
dependencies = [
"fluence-sdk-macro",
"log",
"marine-macro",
"serde",
]
[[package]]
name = "fluence-sdk-wit"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"uuid",
]
[[package]]
name = "getrandom"
version = "0.2.2"
@ -121,6 +88,39 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "marine-macro"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f63d927851847cc3dd9e3bd0f10bdeb313859d4822d5b5f650d9d34d461ed419"
dependencies = [
"marine-macro-impl",
]
[[package]]
name = "marine-macro-impl"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb504be4a90e229ab453c7369cc8a9063acec819f3397802eea719cd0a232be1"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"uuid",
]
[[package]]
name = "marine-timestamp-macro"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5994c7db5567d21609f2a2e5a40d9d4564f86c17ca35b2d77007152619b9d7fc"
dependencies = [
"chrono",
"quote",
]
[[package]]
name = "num-integer"
version = "0.1.44"

2
echo-greeter/echo-service/Cargo.toml
View File

@ -10,6 +10,6 @@ name = "echo_service"
path = "src/main.rs"
[dependencies]
fluence = { version="0.6.2", feature=["log"]}
fluence = { version="0.6.9", feature=["log"]}
log = "0.4.14"

4
echo-greeter/echo-service/build.sh
View File

@ -4,7 +4,7 @@ set -o errexit -o nounset -o pipefail
# This script builds all subprojects and puts all created Wasm modules in one dir
mkdir -p artifacts
# cargo update
fce build --release
marine build --release
rm artifacts/*.wasm
rm -f artifacts/*.wasm
cp target/wasm32-wasi/release/echo_service.wasm artifacts/

6
echo-greeter/echo-service/src/main.rs
View File

@ -1,11 +1,11 @@
use fluence::fce;
use fluence::marine;
#[fce]
#[marine]
pub struct Echo {
pub echo: String,
}
#[fce]
#[marine]
pub fn echo(inputs: Vec<String>) -> Vec<Echo> {
inputs
.iter()

4
echo-greeter/greeting/src/main.rs
View File

@ -14,14 +14,14 @@
* limitations under the License.
*/
use fluence::fce;
use fluence::marine;
use fluence::module_manifest;
module_manifest!();
pub fn main() {}
#[fce]
#[marine]
pub fn greeting(name: String, greeter: bool) -> String {
match greeter {
true => format!("Hi, {}", name),

8
echo-greeter/scripts/build_all.sh
View File

@ -4,11 +4,11 @@ mkdir -p artifacts
rm -f artifacts/*.wasm
cd echo-service
fce build --release
marine build --release
cp target/wasm32-wasi/release/echo_service.wasm ../artifacts/
cd ..
cd greeting
fce build --release
cd ../greeting
marine build --release
cp target/wasm32-wasi/release/greeting.wasm ../artifacts/
cd ..

8
echo-greeter/scripts/deploy_all.sh
View File

@ -1,8 +0,0 @@
#!/usr/bin/env bash
echo "'echo-service' new service:"
# fldist new_service --node 12D3KooWMM28JWc4szJLrpfBoD3a4oWUyMbrywgyneS2kg1KREMY --node-addr /ip4/127.0.0.1/tcp/9999/ws/p2p/12D3KooWMM28JWc4szJLrpfBoD3a4oWUyMbrywgyneS2kg1KREMY --name "echo-service" --modules artifacts/echo_service.wasm:configs/echo_service_cfg.json
echo "'greeting' new service:"
fldist new_service --node 12D3KooWMM28JWc4szJLrpfBoD3a4oWUyMbrywgyneS2kg1KREMY --node-addr /ip4/127.0.0.1/tcp/9999/ws/p2p/12D3KooWMM28JWc4szJLrpfBoD3a4oWUyMbrywgyneS2kg1KREMY --name "greeting" --modules artifacts/greeting.wasm:configs/greeting_cfg.json

80
echo-greeter/secure-greeter/Cargo.lock generated
View File

@ -25,62 +25,29 @@ dependencies = [
"winapi",
]
[[package]]
name = "fce-timestamp-macro"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c59a6302902583b2c84e87de9d72b949da4396a369baf0aaa49e97021600bb0"
dependencies = [
"chrono",
"quote",
]
[[package]]
name = "fluence"
version = "0.6.2"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b731bd4a69a3945186f2ff96ff753908939c8a2debd60e1f0e8edb6a28757f8"
checksum = "88b09e1cd11a51ba4d169db347d009fe41ece2714eef4d5df720343733a1d5a6"
dependencies = [
"fce-timestamp-macro",
"fluence-sdk-macro",
"fluence-sdk-main",
"marine-macro",
"marine-timestamp-macro",
"serde",
]
[[package]]
name = "fluence-sdk-macro"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb43d2f51f1becb70e2125ef8ca9759597900f95cc22ce7dca981a7d6ccd7dde"
dependencies = [
"fluence-sdk-wit",
]
[[package]]
name = "fluence-sdk-main"
version = "0.6.1"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604"
checksum = "68d93cde99e1494e11755a39b93863333397245c9959c774fe3bebd9e4143879"
dependencies = [
"fluence-sdk-macro",
"log",
"marine-macro",
"serde",
]
[[package]]
name = "fluence-sdk-wit"
version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eab3ed39703b72e0e52bce9e1760746c73f65a5694c8da4dec751d3bfdec15b8"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"uuid",
]
[[package]]
name = "getrandom"
version = "0.2.2"
@ -113,6 +80,39 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "marine-macro"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f63d927851847cc3dd9e3bd0f10bdeb313859d4822d5b5f650d9d34d461ed419"
dependencies = [
"marine-macro-impl",
]
[[package]]
name = "marine-macro-impl"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb504be4a90e229ab453c7369cc8a9063acec819f3397802eea719cd0a232be1"
dependencies = [
"proc-macro2",
"quote",
"serde",
"serde_json",
"syn",
"uuid",
]
[[package]]
name = "marine-timestamp-macro"
version = "0.6.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5994c7db5567d21609f2a2e5a40d9d4564f86c17ca35b2d77007152619b9d7fc"
dependencies = [
"chrono",
"quote",
]
[[package]]
name = "num-integer"
version = "0.1.44"

2
echo-greeter/secure-greeter/Cargo.toml
View File

@ -9,5 +9,5 @@ name = "secure_greeter"
path = "src/main.rs"
[dependencies]
fluence = { version="0.6.2", feature=["log"]}
fluence = { version="0.6.9", feature=["log"]}
log = "0.4.14"

7
echo-greeter/secure-greeter/build.sh
View File

@ -1,10 +1,9 @@
#!/usr/bin/env bash
set -o errexit -o nounset -o pipefail
# This script builds all subprojects and puts all created Wasm modules in one dir
mkdir -p artifacts
cargo update
fce build --release
cargo update --aggressive
marine build --release
mkdir -p artifacts
rm -f artifacts/*.wasm
cp target/wasm32-wasi/release/secure_greeter.wasm artifacts/

4
echo-greeter/secure-greeter/deploy.sh
View File

@ -1,4 +0,0 @@
#!/usr/bin/env bash
echo "secure greeter new service:"
fldist new_service --node 12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U --node-addr /ip4/127.0.0.1/tcp/9999/ws/p2p/12D3KooWQYAEG4LJCUYZtnGAxjsDnkfnKSxfrML2RrTLY63dd33U --name "secure-greeter" --modules artifacts/secure_greeter.wasm:configs/secure_greeter_cfg.json

4
echo-greeter/secure-greeter/src/auth.rs
View File

@ -15,7 +15,7 @@
*/
use ::fluence;
use fluence::fce;
use fluence::marine;
pub fn is_owner() -> bool {
let meta = fluence::get_call_parameters();
@ -25,7 +25,7 @@ pub fn is_owner() -> bool {
caller == owner
}
#[fce]
#[marine]
pub fn am_i_owner() -> bool {
is_owner()
}

20
echo-greeter/secure-greeter/src/main.rs
View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
use fluence::fce;
use fluence::marine;
use fluence::module_manifest;
mod auth;
@ -24,23 +24,23 @@ module_manifest!();
pub fn main() {}
#[fce]
#[marine]
#[derive(Debug)]
pub struct Gresult {
pub greeting: String,
pub err_str: String,
}
#[fce]
#[marine]
pub fn greeting(name: String) -> Gresult {
if !is_owner() {
return Gresult {
match is_owner() {
true => Gresult {
greeting: format!("Hi, {}", name),
err_str: "".into(),
},
false => Gresult {
greeting: "".into(),
err_str: "You are not the owner".into(),
};
}
Gresult {
greeting: format!("Hi, {}", name),
err_str: "".into(),
},
}
}