update to marine, marine-test, bump versions

This commit is contained in:
boneyard93501 2021-06-13 13:33:26 -05:00
parent c7dd850cec
commit ccddb4613e
3 changed files with 53 additions and 7 deletions

View File

@ -10,4 +10,7 @@ name = "call_parameters"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
fluence = "=0.5.0" fluence = "0.6.9"
[dev-dependencies]
fluence-test = "0.1.9"

View File

@ -1,8 +1,9 @@
#!/usr/bin/env bash #!/usr/bin/env bash
set -o errexit -o nounset -o pipefail set -o errexit -o nounset -o pipefail
cargo update cargo update --aggressive
fce build --release marine build --release
rm -f artifacts/* mkdir -p artifacts
cp ../../target/wasm32-wasi/release/call_parameters.wasm artifacts/ rm -f artifacts/*.wasm
cp target/wasm32-wasi/release/call_parameters.wasm artifacts/

View File

@ -15,11 +15,16 @@
*/ */
#[cfg(target_arch = "wasm32")] #[cfg(target_arch = "wasm32")]
use fluence::fce; use fluence::marine;
#[cfg(target_arch = "wasm32")]
use fluence::module_manifest;
#[cfg(target_arch = "wasm32")]
module_manifest!();
pub fn main() {} pub fn main() {}
#[fce] #[marine]
#[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();
@ -33,3 +38,40 @@ pub fn call_parameters() -> String {
cp.tetraplets cp.tetraplets
) )
} }
#[cfg(test)]
mod tests {
use fluence_test::marine_test;
use fluence_test::CallParameters;
use fluence_test::SecurityTetraplet;
#[marine_test(config_path = "../Config.toml", modules_dir = "../artifacts")]
fn empty_string() {
let init_peer_id = "init_peer_id";
let service_id = "service_id";
let service_creator_peer_id = "service_creator_peer_id";
let host_id = "host_id";
let particle_id = "particle_id";
let mut tetraplet = SecurityTetraplet::default();
tetraplet.function_name = "some_func_name".to_string();
tetraplet.json_path = "some_json_path".to_string();
let tetraplets = vec![vec![tetraplet]];
let cp = CallParameters {
init_peer_id: init_peer_id.to_string(),
service_id: service_id.to_string(),
service_creator_peer_id: service_creator_peer_id.to_string(),
host_id: host_id.to_string(),
particle_id: particle_id.to_string(),
tetraplets: tetraplets.clone(),
};
let actual = call_parameters.call_parameters_cp(cp);
let expected = format!(
"{}\n{}\n{}\n{}\n{}\n{:?}",
init_peer_id, service_id, service_creator_peer_id, host_id, particle_id, tetraplets
);
assert_eq!(actual, expected);
}
}