update crate references, bump version

This commit is contained in:
boneyard93501 2021-06-15 13:08:11 -05:00
parent 4b8f88c9b2
commit 5d34d1e016
69 changed files with 122 additions and 118 deletions

View File

@ -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"
marine-rs-sdk-test = "0.1.9"

View File

@ -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() {

View File

@ -6,4 +6,4 @@ edition = "2018"
[dependencies]
fluence = { version = "=0.6.9" }
marine-rs-sdk = { version = "=0.6.10" }

View File

@ -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!();

4
echo-greeter/Readme.md Normal file
View File

@ -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.

View File

@ -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"

View File

@ -1,4 +1,4 @@
use fluence::marine;
use marine_rs_sdk::marine;
#[marine]
pub struct Echo {

View File

@ -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"]}

View File

@ -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!();

View File

@ -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"

View File

@ -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();

View File

@ -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;

View File

@ -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"

View File

@ -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!();

View File

@ -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" }

View File

@ -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";

View File

@ -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]

View File

@ -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;

View File

@ -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"

View File

@ -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;

View File

@ -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"
marine-rs-sdk-test = "0.1.9"

View File

@ -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() {

View File

@ -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"

View File

@ -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";

View File

@ -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"

View File

@ -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;

View File

@ -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"

View File

@ -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() {

View File

@ -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;

View File

@ -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"

View File

@ -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!();

View File

@ -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"]}

View File

@ -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();

View File

@ -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;

View File

@ -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;

View File

@ -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"

View File

@ -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!();

View File

@ -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"

View File

@ -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!();

View File

@ -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"

View File

@ -1,5 +1,5 @@
use fluence::marine;
use fluence::module_manifest;
use marine_rs_sdk::marine;
use marine_rs_sdk::module_manifest;
module_manifest!();

View File

@ -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" }

View File

@ -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;

View File

@ -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" }

View File

@ -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;

View File

@ -10,4 +10,4 @@ name = "test_record"
path = "src/test_record.rs"
[dependencies]
fluence = "=0.6.9"
marine-rs-sdk = "=0.6.10"

View File

@ -14,7 +14,7 @@
* limitations under the License.
*/
use fluence::marine;
use marine_rs_sdk::marine;
#[marine]
pub struct TestRecord {

View File

@ -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"

View File

@ -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;

View File

@ -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"

View File

@ -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!();

View File

@ -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"

View File

@ -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!();

View File

@ -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"

View File

@ -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;

View File

@ -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]

View File

@ -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"

View File

@ -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!();

View File

@ -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"

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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 {

View File

@ -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;

View File

@ -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:

View File

@ -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]

View File

@ -1,4 +1,4 @@
use fluence::marine;
use marine_rs_sdk::marine;
#[marine]
pub fn eth_type_test() {

View File

@ -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]

View File

@ -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;