diff --git a/call_parameters/Cargo.toml b/call_parameters/Cargo.toml index 941c768..00d1bd4 100644 --- a/call_parameters/Cargo.toml +++ b/call_parameters/Cargo.toml @@ -10,7 +10,7 @@ name = "call_parameters" path = "src/main.rs" [dependencies] -fluence = "0.6.9" +marine-rs-sdk = "0.6.10" [dev-dependencies] -fluence-test = "0.1.9" \ No newline at end of file +marine-rs-sdk-test = "0.1.9" \ No newline at end of file diff --git a/call_parameters/src/main.rs b/call_parameters/src/main.rs index 394a526..3a73bed 100644 --- a/call_parameters/src/main.rs +++ b/call_parameters/src/main.rs @@ -15,9 +15,9 @@ */ #[cfg(target_arch = "wasm32")] -use fluence::marine; +use marine_rs_sdk::marine; #[cfg(target_arch = "wasm32")] -use fluence::module_manifest; +use marine_rs_sdk::module_manifest; #[cfg(target_arch = "wasm32")] module_manifest!(); @@ -41,9 +41,9 @@ pub fn call_parameters() -> String { #[cfg(test)] mod tests { - use fluence_test::marine_test; - use fluence_test::CallParameters; - use fluence_test::SecurityTetraplet; + use marine_rs_sdk_test::marine_test; + use marine_rs_sdk_test::CallParameters; + use marine_rs_sdk_test::SecurityTetraplet; #[marine_test(config_path = "../Config.toml", modules_dir = "../artifacts")] fn empty_string() { diff --git a/curl_template/backend/Cargo.toml b/curl_template/backend/Cargo.toml index 066817b..4cd20fd 100644 --- a/curl_template/backend/Cargo.toml +++ b/curl_template/backend/Cargo.toml @@ -6,4 +6,4 @@ edition = "2018" [dependencies] -fluence = { version = "=0.6.9" } +marine-rs-sdk = { version = "=0.6.10" } diff --git a/curl_template/backend/src/main.rs b/curl_template/backend/src/main.rs index b2c60c1..17c680a 100644 --- a/curl_template/backend/src/main.rs +++ b/curl_template/backend/src/main.rs @@ -1,9 +1,9 @@ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::MountedBinaryStringResult; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::MountedBinaryStringResult; module_manifest!(); diff --git a/echo-greeter/Readme.md b/echo-greeter/Readme.md new file mode 100644 index 0000000..a1fa0e6 --- /dev/null +++ b/echo-greeter/Readme.md @@ -0,0 +1,4 @@ +# Title + +This example illustrates how to use a greeting service as a consumer of upstream output(s) generated by an echo service. + diff --git a/echo-greeter/echo-service/Cargo.toml b/echo-greeter/echo-service/Cargo.toml index e30d7b7..f01634e 100644 --- a/echo-greeter/echo-service/Cargo.toml +++ b/echo-greeter/echo-service/Cargo.toml @@ -10,6 +10,6 @@ name = "echo_service" path = "src/main.rs" [dependencies] -fluence = { version="0.6.9", feature=["log"]} +marine-rs-sdk = { version="0.6.10", feature=["log"]} log = "0.4.14" diff --git a/echo-greeter/echo-service/src/main.rs b/echo-greeter/echo-service/src/main.rs index b5aa3c9..c36a894 100644 --- a/echo-greeter/echo-service/src/main.rs +++ b/echo-greeter/echo-service/src/main.rs @@ -1,4 +1,4 @@ -use fluence::marine; +use marine_rs_sdk::marine; #[marine] pub struct Echo { diff --git a/echo-greeter/greeting/Cargo.toml b/echo-greeter/greeting/Cargo.toml index 2ef124f..b37174e 100644 --- a/echo-greeter/greeting/Cargo.toml +++ b/echo-greeter/greeting/Cargo.toml @@ -12,6 +12,6 @@ name = "greeting" path = "src/main.rs" [dependencies] -fluence = { version="0.6.2", feature=["log"]} +marine-rs-sdk = { version="0.6.2", feature=["log"]} diff --git a/echo-greeter/greeting/src/main.rs b/echo-greeter/greeting/src/main.rs index 801f52f..f0ac008 100644 --- a/echo-greeter/greeting/src/main.rs +++ b/echo-greeter/greeting/src/main.rs @@ -14,8 +14,8 @@ * limitations under the License. */ -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; module_manifest!(); diff --git a/echo-greeter/secure-greeter/Cargo.toml b/echo-greeter/secure-greeter/Cargo.toml index c8369e4..0f2bae5 100644 --- a/echo-greeter/secure-greeter/Cargo.toml +++ b/echo-greeter/secure-greeter/Cargo.toml @@ -9,5 +9,5 @@ name = "secure_greeter" path = "src/main.rs" [dependencies] -fluence = { version="0.6.9", feature=["log"]} +marine-rs-sdk = { version="0.6.10", feature=["log"]} log = "0.4.14" diff --git a/echo-greeter/secure-greeter/src/auth.rs b/echo-greeter/secure-greeter/src/auth.rs index 0e87f5c..b701c4a 100644 --- a/echo-greeter/secure-greeter/src/auth.rs +++ b/echo-greeter/secure-greeter/src/auth.rs @@ -15,7 +15,7 @@ */ use ::fluence; -use fluence::marine; +use marine_rs_sdk::marine; pub fn is_owner() -> bool { let meta = fluence::get_call_parameters(); diff --git a/echo-greeter/secure-greeter/src/main.rs b/echo-greeter/secure-greeter/src/main.rs index 49d884b..4a268c1 100644 --- a/echo-greeter/secure-greeter/src/main.rs +++ b/echo-greeter/secure-greeter/src/main.rs @@ -14,8 +14,8 @@ * limitations under the License. */ -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; mod auth; use crate::auth::is_owner; diff --git a/ether-price-getter/curl_adapter/Cargo.toml b/ether-price-getter/curl_adapter/Cargo.toml index 5a4e80c..facafea 100644 --- a/ether-price-getter/curl_adapter/Cargo.toml +++ b/ether-price-getter/curl_adapter/Cargo.toml @@ -10,5 +10,5 @@ path = "src/main.rs" name = "curl_adapter" [dependencies] -fluence = { version = "=0.6.9", features = ["logger"]} +marine-rs-sdk = { version = "=0.6.10", features = ["logger"]} log = "0.4.8" diff --git a/ether-price-getter/curl_adapter/src/main.rs b/ether-price-getter/curl_adapter/src/main.rs index 2d6461c..3579a64 100644 --- a/ether-price-getter/curl_adapter/src/main.rs +++ b/ether-price-getter/curl_adapter/src/main.rs @@ -15,10 +15,10 @@ */ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::WasmLoggerBuilder; module_manifest!(); diff --git a/ether-price-getter/ether_price_getter/Cargo.toml b/ether-price-getter/ether_price_getter/Cargo.toml index 9751fbd..60561ff 100644 --- a/ether-price-getter/ether_price_getter/Cargo.toml +++ b/ether-price-getter/ether_price_getter/Cargo.toml @@ -10,6 +10,6 @@ name = "ether_price_getter" path = "src/main.rs" [dependencies] -fluence = { version = "=0.6.9", features = ["logger"]} +marine-rs-sdk = { version = "=0.6.10", features = ["logger"]} log = "0.4.8" fstrings = { version="0.2.3" } diff --git a/ether-price-getter/ether_price_getter/src/eth_price_getter.rs b/ether-price-getter/ether_price_getter/src/eth_price_getter.rs index 479c106..8ec3bc6 100644 --- a/ether-price-getter/ether_price_getter/src/eth_price_getter.rs +++ b/ether-price-getter/ether_price_getter/src/eth_price_getter.rs @@ -15,7 +15,7 @@ */ use crate::curl_request; -use fluence::marine; +use marine_rs_sdk::marine; static URL_LATEST: &'static str = "https://pro-api.coinmarketcap.com/v1/cryptocurrency/quotes/latest"; diff --git a/ether-price-getter/ether_price_getter/src/fce_results.rs b/ether-price-getter/ether_price_getter/src/fce_results.rs index 71c4f9b..bee756e 100644 --- a/ether-price-getter/ether_price_getter/src/fce_results.rs +++ b/ether-price-getter/ether_price_getter/src/fce_results.rs @@ -16,7 +16,7 @@ use crate::jsonrpc_helpers::JSON_RPC; use crate::Result; -use fluence::marine; +use marine_rs_sdk::marine; use serde_json::Value; #[marine] diff --git a/ether-price-getter/ether_price_getter/src/main.rs b/ether-price-getter/ether_price_getter/src/main.rs index 5295694..ca9d4f8 100644 --- a/ether-price-getter/ether_price_getter/src/main.rs +++ b/ether-price-getter/ether_price_getter/src/main.rs @@ -24,10 +24,10 @@ #[macro_use] extern crate fstrings; -use fluence::marine; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::WasmLoggerBuilder; mod eth_price_getter; diff --git a/fluence-cuckoo/cuckoo-filter/Cargo.toml b/fluence-cuckoo/cuckoo-filter/Cargo.toml index 87ceb58..e402455 100644 --- a/fluence-cuckoo/cuckoo-filter/Cargo.toml +++ b/fluence-cuckoo/cuckoo-filter/Cargo.toml @@ -13,5 +13,5 @@ serde = {version = "1.0.0" } serde_json = {version = "1.0.62"} cuckoofilter = {version="0.5.0", features=["serde_support"] } log = "0.4" -fluence = { version = "0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "0.6.10", features = ["logger"] } flate2 = "1.0.20" \ No newline at end of file diff --git a/fluence-cuckoo/cuckoo-filter/src/main.rs b/fluence-cuckoo/cuckoo-filter/src/main.rs index 1790818..4ff6869 100644 --- a/fluence-cuckoo/cuckoo-filter/src/main.rs +++ b/fluence-cuckoo/cuckoo-filter/src/main.rs @@ -2,7 +2,7 @@ use cuckoofilter::{CuckooFilter, ExportedCuckooFilter}; use flate2::read::ZlibDecoder; use flate2::write::ZlibEncoder; use flate2::Compression; -use fluence::marine; +use marine_rs_sdk::marine; use serde::Serialize; use serde_json; use std::collections::hash_map::DefaultHasher; diff --git a/greeting/Cargo.toml b/greeting/Cargo.toml index 68a1bf0..5a41b4a 100644 --- a/greeting/Cargo.toml +++ b/greeting/Cargo.toml @@ -12,7 +12,7 @@ name = "greeting" path = "src/main.rs" [dependencies] -fluence = "0.6.9" +marine-rs-sdk = "0.6.10" [dev-dependencies] -fluence-test = "0.1.9" \ No newline at end of file +marine-rs-sdk-test = "0.1.9" \ No newline at end of file diff --git a/greeting/src/main.rs b/greeting/src/main.rs index 112c572..b2facba 100644 --- a/greeting/src/main.rs +++ b/greeting/src/main.rs @@ -14,8 +14,8 @@ * limitations under the License. */ -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; module_manifest!(); @@ -28,7 +28,7 @@ pub fn greeting(name: String) -> String { #[cfg(test)] mod tests { - use fluence_test::marine_test; + use marine_rs_sdk_test::marine_test; #[marine_test(config_path = "../Config.toml", modules_dir = "../artifacts")] fn empty_string() { diff --git a/ipfs-node/effector/Cargo.toml b/ipfs-node/effector/Cargo.toml index 04115af..606cda4 100644 --- a/ipfs-node/effector/Cargo.toml +++ b/ipfs-node/effector/Cargo.toml @@ -10,5 +10,5 @@ name = "ipfs_effector" path = "src/main.rs" [dependencies] -fluence = { version = "0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "0.6.10", features = ["logger"] } log = "0.4.14" \ No newline at end of file diff --git a/ipfs-node/effector/src/main.rs b/ipfs-node/effector/src/main.rs index e02ae88..f83b23b 100644 --- a/ipfs-node/effector/src/main.rs +++ b/ipfs-node/effector/src/main.rs @@ -20,10 +20,10 @@ mod path; use crate::path::to_full_path; -use fluence::marine; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::WasmLoggerBuilder; const RESULT_FILE_PATH: &str = "/tmp/ipfs_rpc_file"; const IPFS_ADDR_ENV_NAME: &str = "IPFS_ADDR"; diff --git a/ipfs-node/pure/Cargo.toml b/ipfs-node/pure/Cargo.toml index c335012..a82d393 100644 --- a/ipfs-node/pure/Cargo.toml +++ b/ipfs-node/pure/Cargo.toml @@ -10,5 +10,5 @@ name = "ipfs_pure" path = "src/main.rs" [dependencies] -fluence = { version = "0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "0.6.10", features = ["logger"] } log = "0.4.14" \ No newline at end of file diff --git a/ipfs-node/pure/src/main.rs b/ipfs-node/pure/src/main.rs index af70777..7a28624 100644 --- a/ipfs-node/pure/src/main.rs +++ b/ipfs-node/pure/src/main.rs @@ -16,9 +16,9 @@ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::WasmLoggerBuilder; use std::fs; use std::path::PathBuf; diff --git a/multi-service/block_getter/Cargo.toml b/multi-service/block_getter/Cargo.toml index 1b4fabe..a30b117 100644 --- a/multi-service/block_getter/Cargo.toml +++ b/multi-service/block_getter/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -fluence = { version = "=0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "=0.6.10", features = ["logger"] } log = "0.4.14" serde_json = "1.0.64" fstrings = "0.2.3" diff --git a/multi-service/block_getter/src/eth_block_getters.rs b/multi-service/block_getter/src/eth_block_getters.rs index ce1ad4a..18532fe 100644 --- a/multi-service/block_getter/src/eth_block_getters.rs +++ b/multi-service/block_getter/src/eth_block_getters.rs @@ -15,8 +15,8 @@ */ use crate::curl_request; -use fluence::marine; -use fluence::MountedBinaryResult; +use marine_rs_sdk::marine; +use marine_rs_sdk::MountedBinaryResult; fn result_to_string(result: MountedBinaryResult) -> String { if result.is_success() { diff --git a/multi-service/block_getter/src/main.rs b/multi-service/block_getter/src/main.rs index 603d943..4bd2f67 100644 --- a/multi-service/block_getter/src/main.rs +++ b/multi-service/block_getter/src/main.rs @@ -16,9 +16,9 @@ #[macro_use] extern crate fstrings; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::{marine, WasmLoggerBuilder}; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::{marine, WasmLoggerBuilder}; mod eth_block_getters; diff --git a/multi-service/curl_adapter/Cargo.toml b/multi-service/curl_adapter/Cargo.toml index af9b107..583f4d2 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.6.9", features = ["logger"] } +marine-rs-sdk = { version = "=0.6.10", 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 2d6461c..3579a64 100644 --- a/multi-service/curl_adapter/src/main.rs +++ b/multi-service/curl_adapter/src/main.rs @@ -15,10 +15,10 @@ */ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::WasmLoggerBuilder; module_manifest!(); diff --git a/multi-service/ethqlite/Cargo.toml b/multi-service/ethqlite/Cargo.toml index 83d5022..b6efb45 100644 --- a/multi-service/ethqlite/Cargo.toml +++ b/multi-service/ethqlite/Cargo.toml @@ -9,7 +9,7 @@ name = "ethqlite" path = "src/main.rs" [dependencies] -fluence = { version="0.6.9", features = ["logger"]} +marine-rs-sdk = { version="0.6.10", features = ["logger"]} log = "0.4.8" fce-sqlite-connector = "=0.4.0" serde = {version = "1.0.118", features=["derive"]} diff --git a/multi-service/ethqlite/src/auth.rs b/multi-service/ethqlite/src/auth.rs index 13ef83b..8857c9e 100644 --- a/multi-service/ethqlite/src/auth.rs +++ b/multi-service/ethqlite/src/auth.rs @@ -16,7 +16,7 @@ use crate::get_connection; use ::fluence; -use fluence::{marine, CallParameters}; +use marine_rs_sdk::{marine, CallParameters}; pub fn is_owner() -> bool { let meta = fluence::get_call_parameters(); diff --git a/multi-service/ethqlite/src/crud.rs b/multi-service/ethqlite/src/crud.rs index 8f8bb3b..24d7f33 100644 --- a/multi-service/ethqlite/src/crud.rs +++ b/multi-service/ethqlite/src/crud.rs @@ -15,7 +15,7 @@ */ use fce_sqlite_connector; use fce_sqlite_connector::{Connection, Value}; -use fluence::marine; +use marine_rs_sdk::marine; use crate::auth::is_owner; use crate::get_connection; diff --git a/multi-service/ethqlite/src/main.rs b/multi-service/ethqlite/src/main.rs index 2fe0549..b5d4d64 100644 --- a/multi-service/ethqlite/src/main.rs +++ b/multi-service/ethqlite/src/main.rs @@ -18,8 +18,8 @@ use fce_sqlite_connector; use fce_sqlite_connector::{Connection, State, Value}; ///, WasmLoggerBuilder}; use fluence; -use fluence::marine; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::WasmLoggerBuilder; use serde::Deserialize; use serde_json; diff --git a/multi-service/extract_miner_address/Cargo.toml b/multi-service/extract_miner_address/Cargo.toml index 60e5a6f..da08758 100644 --- a/multi-service/extract_miner_address/Cargo.toml +++ b/multi-service/extract_miner_address/Cargo.toml @@ -7,6 +7,6 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -fluence = { version = "=0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "=0.6.10", features = ["logger"] } log = "0.4.8" serde_json = "1.0.64" diff --git a/multi-service/extract_miner_address/src/main.rs b/multi-service/extract_miner_address/src/main.rs index 1866d84..7730276 100644 --- a/multi-service/extract_miner_address/src/main.rs +++ b/multi-service/extract_miner_address/src/main.rs @@ -1,5 +1,5 @@ -use fluence::module_manifest; -use fluence::{marine, WasmLoggerBuilder}; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::{marine, WasmLoggerBuilder}; use serde_json; module_manifest!(); diff --git a/multi-service/hex_converter/Cargo.toml b/multi-service/hex_converter/Cargo.toml index 1183479..bae9d18 100644 --- a/multi-service/hex_converter/Cargo.toml +++ b/multi-service/hex_converter/Cargo.toml @@ -5,6 +5,6 @@ authors = ["boneyard93501 <4523011+boneyard93501@users.noreply.github.com>"] edition = "2018" [dependencies] -fluence = { version = "=0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "=0.6.10", features = ["logger"] } log = "0.4.8" serde_json = "1.0.64" diff --git a/multi-service/hex_converter/src/main.rs b/multi-service/hex_converter/src/main.rs index 4e9772c..1d40a66 100644 --- a/multi-service/hex_converter/src/main.rs +++ b/multi-service/hex_converter/src/main.rs @@ -14,8 +14,8 @@ * limitations under the License. */ -use fluence::module_manifest; -use fluence::{marine, WasmLoggerBuilder}; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::{marine, WasmLoggerBuilder}; use serde_json; module_manifest!(); diff --git a/multi-service/simple_range_func/Cargo.toml b/multi-service/simple_range_func/Cargo.toml index 2dfd9d2..7902fc9 100644 --- a/multi-service/simple_range_func/Cargo.toml +++ b/multi-service/simple_range_func/Cargo.toml @@ -5,5 +5,5 @@ authors = ["Fluence Team"] edition = "2018" [dependencies] -fluence = { version = "0.6.2", features = ["logger"]} +marine-rs-sdk = { version = "0.6.2", features = ["logger"]} log = "0.4.8" \ No newline at end of file diff --git a/multi-service/simple_range_func/src/main.rs b/multi-service/simple_range_func/src/main.rs index 278946c..b4849cb 100644 --- a/multi-service/simple_range_func/src/main.rs +++ b/multi-service/simple_range_func/src/main.rs @@ -1,5 +1,5 @@ -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; module_manifest!(); diff --git a/records/effector/Cargo.toml b/records/effector/Cargo.toml index f1204a9..95729ec 100644 --- a/records/effector/Cargo.toml +++ b/records/effector/Cargo.toml @@ -10,5 +10,5 @@ name = "records_effector" path = "src/main.rs" [dependencies] -fluence = "0.6.9" +marine-rs-sdk = "0.6.10" test-record = { path = "../test-record" } \ No newline at end of file diff --git a/records/effector/src/main.rs b/records/effector/src/main.rs index 1e170c0..3809741 100644 --- a/records/effector/src/main.rs +++ b/records/effector/src/main.rs @@ -14,8 +14,8 @@ * limitations under the License. */ -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; use test_record::TestRecord; diff --git a/records/pure/Cargo.toml b/records/pure/Cargo.toml index e225fbb..e5b9319 100644 --- a/records/pure/Cargo.toml +++ b/records/pure/Cargo.toml @@ -10,5 +10,5 @@ name = "records_pure" path = "src/main.rs" [dependencies] -fluence = "0.6.9" +marine-rs-sdk = "0.6.10" test-record = { path = "../test-record" } \ No newline at end of file diff --git a/records/pure/src/main.rs b/records/pure/src/main.rs index 5afc149..65bd6b2 100644 --- a/records/pure/src/main.rs +++ b/records/pure/src/main.rs @@ -16,8 +16,8 @@ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; use test_record::TestRecord; diff --git a/records/test-record/Cargo.toml b/records/test-record/Cargo.toml index b5c023b..407a50e 100644 --- a/records/test-record/Cargo.toml +++ b/records/test-record/Cargo.toml @@ -10,4 +10,4 @@ name = "test_record" path = "src/test_record.rs" [dependencies] -fluence = "=0.6.9" +marine-rs-sdk = "=0.6.10" diff --git a/records/test-record/src/test_record.rs b/records/test-record/src/test_record.rs index ec3693b..e04348a 100644 --- a/records/test-record/src/test_record.rs +++ b/records/test-record/src/test_record.rs @@ -14,7 +14,7 @@ * limitations under the License. */ -use fluence::marine; +use marine_rs_sdk::marine; #[marine] pub struct TestRecord { diff --git a/sqlite/Cargo.toml b/sqlite/Cargo.toml index ff499e6..7299329 100644 --- a/sqlite/Cargo.toml +++ b/sqlite/Cargo.toml @@ -10,6 +10,6 @@ name = "sqlite_test" path = "src/main.rs" [dependencies] -fluence = "0.6.9" +marine-rs-sdk = "0.6.10" marine-sqlite-connector = "0.4.1" diff --git a/sqlite/src/main.rs b/sqlite/src/main.rs index db0cc51..f49e6ba 100644 --- a/sqlite/src/main.rs +++ b/sqlite/src/main.rs @@ -14,8 +14,8 @@ * limitations under the License. */ -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; use marine_sqlite_connector; use marine_sqlite_connector::State; diff --git a/url-downloader/curl_adapter/Cargo.toml b/url-downloader/curl_adapter/Cargo.toml index 449f32d..2f97a98 100644 --- a/url-downloader/curl_adapter/Cargo.toml +++ b/url-downloader/curl_adapter/Cargo.toml @@ -10,5 +10,5 @@ path = "src/main.rs" name = "curl_adapter" [dependencies] -fluence = { version = "0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "0.6.10", features = ["logger"] } log = "0.4.8" diff --git a/url-downloader/curl_adapter/src/main.rs b/url-downloader/curl_adapter/src/main.rs index 554c054..8b279f7 100644 --- a/url-downloader/curl_adapter/src/main.rs +++ b/url-downloader/curl_adapter/src/main.rs @@ -16,11 +16,11 @@ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; -use fluence::MountedBinaryResult; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::WasmLoggerBuilder; module_manifest!(); diff --git a/url-downloader/facade/Cargo.toml b/url-downloader/facade/Cargo.toml index 2028e84..0ad5b14 100644 --- a/url-downloader/facade/Cargo.toml +++ b/url-downloader/facade/Cargo.toml @@ -10,6 +10,6 @@ name = "facade" path = "src/main.rs" [dependencies] -fluence = { version = "0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "0.6.10", features = ["logger"] } anyhow = "1.0.31" log = "0.4.8" \ No newline at end of file diff --git a/url-downloader/facade/src/main.rs b/url-downloader/facade/src/main.rs index 43edd23..548a92e 100644 --- a/url-downloader/facade/src/main.rs +++ b/url-downloader/facade/src/main.rs @@ -15,9 +15,9 @@ */ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::WasmLoggerBuilder; module_manifest!(); diff --git a/url-downloader/local_storage/Cargo.toml b/url-downloader/local_storage/Cargo.toml index 141fe3f..18f2f84 100644 --- a/url-downloader/local_storage/Cargo.toml +++ b/url-downloader/local_storage/Cargo.toml @@ -10,6 +10,6 @@ name = "local_storage" path = "src/main.rs" [dependencies] -fluence = { version = "0.6.9", features = ["logger"] } +marine-rs-sdk = { version = "0.6.10", features = ["logger"] } wasm-tracing-allocator = "0.1.1" log = "0.4.8" diff --git a/url-downloader/local_storage/src/main.rs b/url-downloader/local_storage/src/main.rs index d45083c..4ba7fde 100644 --- a/url-downloader/local_storage/src/main.rs +++ b/url-downloader/local_storage/src/main.rs @@ -14,9 +14,9 @@ * limitations under the License. */ -use fluence::marine; -use fluence::module_manifest; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::WasmLoggerBuilder; use std::fs; use std::path::PathBuf; diff --git a/web3-examples/web3-examples/Readme.md b/web3-examples/web3-examples/Readme.md index 0a179b7..1bcb4da 100644 --- a/web3-examples/web3-examples/Readme.md +++ b/web3-examples/web3-examples/Readme.md @@ -218,7 +218,7 @@ That's it !! While there are no hard and fast rules to determine optional service granularity, [theory](https://onlinelibrary.wiley.com/doi/full/10.1002/spe.2869) and common sense do help. Let's look at what could be a fine-grained, self-contained service: A service that could generate the [method id](https://docs.soliditylang.org/en/latest/abi-spec.html) for Ethereum smart contract functions. A simple method id [generator](facade/src/eth_hashers.rs) may look like this: ```rust -use fluence::fce; +use marine_rs_sdk::fce; use tiny_keccak::Sha3; #[fce] diff --git a/web3-examples/web3-examples/curl_adapter/Cargo.toml b/web3-examples/web3-examples/curl_adapter/Cargo.toml index 5a4e80c..facafea 100644 --- a/web3-examples/web3-examples/curl_adapter/Cargo.toml +++ b/web3-examples/web3-examples/curl_adapter/Cargo.toml @@ -10,5 +10,5 @@ path = "src/main.rs" name = "curl_adapter" [dependencies] -fluence = { version = "=0.6.9", features = ["logger"]} +marine-rs-sdk = { version = "=0.6.10", features = ["logger"]} log = "0.4.8" diff --git a/web3-examples/web3-examples/curl_adapter/src/main.rs b/web3-examples/web3-examples/curl_adapter/src/main.rs index d9feb71..b3bfff4 100644 --- a/web3-examples/web3-examples/curl_adapter/src/main.rs +++ b/web3-examples/web3-examples/curl_adapter/src/main.rs @@ -16,10 +16,10 @@ #![allow(improper_ctypes)] -use fluence::marine; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::WasmLoggerBuilder; module_manifest!(); diff --git a/web3-examples/web3-examples/facade/Cargo.toml b/web3-examples/web3-examples/facade/Cargo.toml index 0142b1c..fcbea29 100644 --- a/web3-examples/web3-examples/facade/Cargo.toml +++ b/web3-examples/web3-examples/facade/Cargo.toml @@ -14,7 +14,7 @@ path = "src/main.rs" [dependencies] serde = {version = "1.0.118", features = ["derive"] } serde_json = "1.0.64" -fluence = { version = "=0.6.9", features = ["logger"]} +marine-rs-sdk = { version = "=0.6.10", features = ["logger"]} log = "0.4.8" chrono = "0.4.19" ethereum-types = "0.11.0" diff --git a/web3-examples/web3-examples/facade/src/data_processing.rs b/web3-examples/web3-examples/facade/src/data_processing.rs index f67df60..a67cf77 100644 --- a/web3-examples/web3-examples/facade/src/data_processing.rs +++ b/web3-examples/web3-examples/facade/src/data_processing.rs @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -use fluence::marine; +use marine_rs_sdk::marine; use serde::{Deserialize, Serialize}; use serde_json; diff --git a/web3-examples/web3-examples/facade/src/data_processing_tests.rs b/web3-examples/web3-examples/facade/src/data_processing_tests.rs index 42e0943..366aae4 100644 --- a/web3-examples/web3-examples/facade/src/data_processing_tests.rs +++ b/web3-examples/web3-examples/facade/src/data_processing_tests.rs @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -use fluence::marine; +use marine_rs_sdk::marine; use serde::{Deserialize, Serialize}; use serde_json; diff --git a/web3-examples/web3-examples/facade/src/eth_calls.rs b/web3-examples/web3-examples/facade/src/eth_calls.rs index 1dc7765..ecc3ef9 100644 --- a/web3-examples/web3-examples/facade/src/eth_calls.rs +++ b/web3-examples/web3-examples/facade/src/eth_calls.rs @@ -19,7 +19,7 @@ use crate::eth_utils::{check_response_string, get_nonce, BLOCK_NUMBER_TAGS}; use crate::fce_results::JsonRpcResult; use crate::jsonrpc_helpers::{batch, Request}; use chrono::Utc; -use fluence::marine; +use marine_rs_sdk::marine; use serde::{Deserialize, Deserializer, Serialize}; use serde_json; use serde_json::Value; diff --git a/web3-examples/web3-examples/facade/src/eth_calls_tests.rs b/web3-examples/web3-examples/facade/src/eth_calls_tests.rs index 9234fd0..67ff267 100644 --- a/web3-examples/web3-examples/facade/src/eth_calls_tests.rs +++ b/web3-examples/web3-examples/facade/src/eth_calls_tests.rs @@ -18,7 +18,7 @@ use crate::eth_calls::{eth_get_balance, eth_get_tx_by_hash}; use crate::eth_filters::{get_filter_changes, new_pending_tx_filter, uninstall_filter}; use crate::eth_utils::wei_to_eth; use crate::fce_results::TestResult; -use fluence::marine; +use marine_rs_sdk::marine; #[marine] fn test_eth_get_balance_good(url: String) -> TestResult { diff --git a/web3-examples/web3-examples/facade/src/eth_filter_test.rs b/web3-examples/web3-examples/facade/src/eth_filter_test.rs index ea56618..876d18f 100644 --- a/web3-examples/web3-examples/facade/src/eth_filter_test.rs +++ b/web3-examples/web3-examples/facade/src/eth_filter_test.rs @@ -18,7 +18,7 @@ use crate::eth_calls::{eth_get_balance, eth_get_tx_by_hash}; use crate::eth_filters::{get_filter_changes, new_pending_tx_filter, uninstall_filter}; use crate::eth_utils::wei_to_eth; use crate::fce_results::TestResult; -use fluence::marine; +use marine_rs_sdk::marine; use serde_json; use serde_json::Value; diff --git a/web3-examples/web3-examples/facade/src/eth_filters.rs b/web3-examples/web3-examples/facade/src/eth_filters.rs index 059bdc5..5c8d4bd 100644 --- a/web3-examples/web3-examples/facade/src/eth_filters.rs +++ b/web3-examples/web3-examples/facade/src/eth_filters.rs @@ -19,7 +19,7 @@ use crate::eth_utils::{check_response_string, get_nonce}; use crate::fce_results::JsonRpcResult; use crate::jsonrpc_helpers::Request; use crate::jsonrpc_helpers::JSON_RPC; -use fluence::marine; +use marine_rs_sdk::marine; use serde_json::Value; /// see: diff --git a/web3-examples/web3-examples/facade/src/eth_hashers.rs b/web3-examples/web3-examples/facade/src/eth_hashers.rs index 468ef14..617ef56 100644 --- a/web3-examples/web3-examples/facade/src/eth_hashers.rs +++ b/web3-examples/web3-examples/facade/src/eth_hashers.rs @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -use fluence::marine; +use marine_rs_sdk::marine; use tiny_keccak::{Hasher, Keccak}; #[marine] diff --git a/web3-examples/web3-examples/facade/src/eth_type_test.rs b/web3-examples/web3-examples/facade/src/eth_type_test.rs index 9517227..9d88a4c 100644 --- a/web3-examples/web3-examples/facade/src/eth_type_test.rs +++ b/web3-examples/web3-examples/facade/src/eth_type_test.rs @@ -1,4 +1,4 @@ -use fluence::marine; +use marine_rs_sdk::marine; #[marine] pub fn eth_type_test() { diff --git a/web3-examples/web3-examples/facade/src/fce_results.rs b/web3-examples/web3-examples/facade/src/fce_results.rs index 71c4f9b..bee756e 100644 --- a/web3-examples/web3-examples/facade/src/fce_results.rs +++ b/web3-examples/web3-examples/facade/src/fce_results.rs @@ -16,7 +16,7 @@ use crate::jsonrpc_helpers::JSON_RPC; use crate::Result; -use fluence::marine; +use marine_rs_sdk::marine; use serde_json::Value; #[marine] diff --git a/web3-examples/web3-examples/facade/src/main.rs b/web3-examples/web3-examples/facade/src/main.rs index 309e887..962bedc 100644 --- a/web3-examples/web3-examples/facade/src/main.rs +++ b/web3-examples/web3-examples/facade/src/main.rs @@ -22,10 +22,10 @@ unused_mut )] -use fluence::marine; -use fluence::module_manifest; -use fluence::MountedBinaryResult; -use fluence::WasmLoggerBuilder; +use marine_rs_sdk::marine; +use marine_rs_sdk::module_manifest; +use marine_rs_sdk::MountedBinaryResult; +use marine_rs_sdk::WasmLoggerBuilder; mod data_processing; mod eth_calls;