From 96d9cd42dbb82460be2d5ba7a655b6432278cbda Mon Sep 17 00:00:00 2001 From: boneyard93501 <4523011+boneyard93501@users.noreply.github.com> Date: Thu, 29 Apr 2021 19:11:44 -0500 Subject: [PATCH] update to fluence 0.6.2, remove unsafe --- multi-service/curl_adapter/Cargo.toml | 4 ++-- multi-service/curl_adapter/src/main.rs | 20 ++++++++++++-------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/multi-service/curl_adapter/Cargo.toml b/multi-service/curl_adapter/Cargo.toml index aef526a..1d7f6ca 100644 --- a/multi-service/curl_adapter/Cargo.toml +++ b/multi-service/curl_adapter/Cargo.toml @@ -10,6 +10,6 @@ path = "src/main.rs" name = "curl_adapter" [dependencies] -fluence = { version = "=0.3.3", features = ["logger"] } -log = "0.4.8" +fluence = { version = "=0.6.2", features = ["logger"] } +log = "0.4.14" serde_json = "1.0.64" diff --git a/multi-service/curl_adapter/src/main.rs b/multi-service/curl_adapter/src/main.rs index 120878b..8e8da41 100644 --- a/multi-service/curl_adapter/src/main.rs +++ b/multi-service/curl_adapter/src/main.rs @@ -16,15 +16,19 @@ #![allow(improper_ctypes)] use fluence::fce; -// use fluence::MountedBinaryStringResult as StringResult; -use fluence::MountedBinaryResult as Result; +use fluence::module_manifest; +use fluence::MountedBinaryResult; +use fluence::WasmLoggerBuilder; -fn main() {} +module_manifest!(); + +fn main() { + WasmLoggerBuilder::new().build().unwrap(); +} #[fce] -pub fn curl_request(curl_cmd: Vec) -> Result { - let response = unsafe { curl(curl_cmd.clone()) }; - log::info!("curl response for {:?} : {:?}", curl_cmd, response); +pub fn curl_request(curl_cmd: Vec) -> MountedBinaryResult { + let response = curl(curl_cmd); response } @@ -32,5 +36,5 @@ pub fn curl_request(curl_cmd: Vec) -> Result { #[fce] #[link(wasm_import_module = "host")] extern "C" { - pub fn curl(cmd: Vec) -> Result; -} \ No newline at end of file + pub fn curl(cmd: Vec) -> MountedBinaryResult; +}