update to marine, marine-test, bump versions

This commit is contained in:
boneyard93501 2021-06-13 15:25:55 -05:00
parent 15a811484f
commit 3a6be62bde
15 changed files with 41 additions and 456 deletions

View File

@ -0,0 +1,17 @@
[package]
name = "cuckoo-filter"
version = "0.1.0"
authors = ["boneyard93501 <4523011+boneyard93501@users.noreply.github.com>"]
edition = "2018"
[[bin]]
name = "cuckoo_filter"
path = "src/main.rs"
[dependencies]
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"] }
flate2 = "1.0.20"

View File

@ -1,6 +1,6 @@
modules_dir = "artifacts/" modules_dir = "artifacts/"
[[module]] [[module]]
name = "fce-cuckoo" name = "cuckoo_filter"
logger_enabled = true logger_enabled = true

View File

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

View File

@ -0,0 +1,3 @@
{
"name": "cuckoo_filter"
}

View File

@ -2,7 +2,7 @@ use cuckoofilter::{CuckooFilter, ExportedCuckooFilter};
use flate2::read::ZlibDecoder; use flate2::read::ZlibDecoder;
use flate2::write::ZlibEncoder; use flate2::write::ZlibEncoder;
use flate2::Compression; use flate2::Compression;
use fluence::fce; use fluence::marine;
use serde::Serialize; use serde::Serialize;
use serde_json; use serde_json;
use std::collections::hash_map::DefaultHasher; use std::collections::hash_map::DefaultHasher;
@ -36,7 +36,7 @@ fn de_cf(cf: Vec<u8>) -> Result<CF, String> {
)) ))
} }
#[fce] #[marine]
pub fn create_cf(with_capacity: String) -> Vec<u8> { pub fn create_cf(with_capacity: String) -> Vec<u8> {
let capacity = with_capacity.parse::<u32>().unwrap(); let capacity = with_capacity.parse::<u32>().unwrap();
let cf = match capacity { let cf = match capacity {
@ -46,7 +46,7 @@ pub fn create_cf(with_capacity: String) -> Vec<u8> {
ser_cf(cf) ser_cf(cf)
} }
#[fce] #[marine]
// one day, this may be available // one day, this may be available
// pub fn create_and_add_cf<T: ?Sized + Hash>(data: &T) -> String { // pub fn create_and_add_cf<T: ?Sized + Hash>(data: &T) -> String {
// until then, we use bytesrings although a json string of array of values should also work // until then, we use bytesrings although a json string of array of values should also work
@ -59,7 +59,7 @@ pub fn create_and_add_cf(data: Vec<Vec<u8>>) -> Vec<u8> {
ser_cf(cf) ser_cf(cf)
} }
#[fce] #[marine]
pub fn add(cf: Vec<u8>, data: Vec<Vec<u8>>) -> Vec<u8> { pub fn add(cf: Vec<u8>, data: Vec<Vec<u8>>) -> Vec<u8> {
let mut cf: CF = de_cf(cf).unwrap(); let mut cf: CF = de_cf(cf).unwrap();
let result = Vec::<bool>::new(); let result = Vec::<bool>::new();
@ -70,7 +70,7 @@ pub fn add(cf: Vec<u8>, data: Vec<Vec<u8>>) -> Vec<u8> {
ser_cf(cf) ser_cf(cf)
} }
#[fce] #[marine]
pub fn delete(cf: Vec<u8>, items: Vec<Vec<u8>>) -> Vec<bool> { pub fn delete(cf: Vec<u8>, items: Vec<Vec<u8>>) -> Vec<bool> {
let mut cf = de_cf(cf).unwrap(); let mut cf = de_cf(cf).unwrap();
let mut result = Vec::<bool>::new(); let mut result = Vec::<bool>::new();
@ -80,7 +80,7 @@ pub fn delete(cf: Vec<u8>, items: Vec<Vec<u8>>) -> Vec<bool> {
result result
} }
#[fce] #[marine]
pub fn contains(cf: Vec<u8>, items: Vec<Vec<u8>>) -> Vec<bool> { pub fn contains(cf: Vec<u8>, items: Vec<Vec<u8>>) -> Vec<bool> {
let cf = de_cf(cf).unwrap(); let cf = de_cf(cf).unwrap();
let mut result = Vec::<bool>::new(); let mut result = Vec::<bool>::new();
@ -90,25 +90,25 @@ pub fn contains(cf: Vec<u8>, items: Vec<Vec<u8>>) -> Vec<bool> {
result result
} }
#[fce] #[marine]
pub fn is_empty(cf: Vec<u8>) -> bool { pub fn is_empty(cf: Vec<u8>) -> bool {
let cf = de_cf(cf).unwrap(); let cf = de_cf(cf).unwrap();
cf.is_empty() cf.is_empty()
} }
#[fce] #[marine]
pub fn memory_usage(cf: Vec<u8>) -> u64 { pub fn memory_usage(cf: Vec<u8>) -> u64 {
let cf = de_cf(cf).unwrap(); let cf = de_cf(cf).unwrap();
cf.memory_usage() as u64 cf.memory_usage() as u64
} }
#[fce] #[marine]
pub fn len(cf: Vec<u8>) -> u64 { pub fn len(cf: Vec<u8>) -> u64 {
let cf = de_cf(cf).unwrap(); let cf = de_cf(cf).unwrap();
cf.len() as u64 cf.len() as u64
} }
#[fce] #[marine]
pub fn service_info() -> String { pub fn service_info() -> String {
#[derive(Serialize)] #[derive(Serialize)]
struct ServiceInfo { struct ServiceInfo {
@ -131,7 +131,7 @@ pub fn service_info() -> String {
} }
/* /*
#[fce] #[marine]
pub fn smoker() { pub fn smoker() {
let mut data: Vec<Vec<u8>> = Vec::new(); let mut data: Vec<Vec<u8>> = Vec::new();
data.push(5_u32.to_le_bytes().to_vec()); data.push(5_u32.to_le_bytes().to_vec());

View File

@ -1,401 +0,0 @@
# This file is automatically @generated by Cargo.
# It is not intended for manual editing.
[[package]]
name = "adler"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bedc89c5c7b5550ffb9372eb5c5ffc7f9f705cc3f4a128bd4669b9745f555093"
[[package]]
name = "autocfg"
version = "1.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
[[package]]
name = "byteorder"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b"
[[package]]
name = "cfg-if"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73"
dependencies = [
"libc",
"num-integer",
"num-traits",
"time",
"winapi",
]
[[package]]
name = "crc32fast"
version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81156fece84ab6a9f2afdb109ce3ae577e42b1228441eded99bd77f627953b1a"
dependencies = [
"cfg-if",
]
[[package]]
name = "cuckoofilter"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b810a8449931679f64cd7eef1bbd0fa315801b6d5d9cdc1ace2804d6529eee18"
dependencies = [
"byteorder",
"fnv",
"rand",
"serde",
"serde_bytes",
"serde_derive",
]
[[package]]
name = "fce-cuckoo"
version = "0.1.0"
dependencies = [
"cuckoofilter",
"flate2",
"fluence",
"log",
"serde",
"serde_json",
]
[[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 = "flate2"
version = "1.0.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd3aec53de10fe96d7d8c565eb17f2c687bb5518a2ec453b5b1252964526abe0"
dependencies = [
"cfg-if",
"crc32fast",
"libc",
"miniz_oxide",
]
[[package]]
name = "fluence"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b731bd4a69a3945186f2ff96ff753908939c8a2debd60e1f0e8edb6a28757f8"
dependencies = [
"fce-timestamp-macro",
"fluence-sdk-macro",
"fluence-sdk-main",
"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"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a78910d85e3cdcb9c2baf56144f20a99925c67ac445d4156220c005bfd2f9604"
dependencies = [
"fluence-sdk-macro",
"log",
"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 = "fnv"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "getrandom"
version = "0.1.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
dependencies = [
"cfg-if",
"libc",
"wasi 0.9.0+wasi-snapshot-preview1",
]
[[package]]
name = "getrandom"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8"
dependencies = [
"cfg-if",
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
]
[[package]]
name = "itoa"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "libc"
version = "0.2.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7282d924be3275cec7f6756ff4121987bc6481325397dde6ba3e7802b1a8b1c"
[[package]]
name = "log"
version = "0.4.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710"
dependencies = [
"cfg-if",
]
[[package]]
name = "miniz_oxide"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b"
dependencies = [
"adler",
"autocfg",
]
[[package]]
name = "num-integer"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db"
dependencies = [
"autocfg",
"num-traits",
]
[[package]]
name = "num-traits"
version = "0.2.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
dependencies = [
"autocfg",
]
[[package]]
name = "ppv-lite86"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857"
[[package]]
name = "proc-macro2"
version = "1.0.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
dependencies = [
"unicode-xid",
]
[[package]]
name = "quote"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
dependencies = [
"proc-macro2",
]
[[package]]
name = "rand"
version = "0.7.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
dependencies = [
"getrandom 0.1.16",
"libc",
"rand_chacha",
"rand_core",
"rand_hc",
]
[[package]]
name = "rand_chacha"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
dependencies = [
"ppv-lite86",
"rand_core",
]
[[package]]
name = "rand_core"
version = "0.5.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
dependencies = [
"getrandom 0.1.16",
]
[[package]]
name = "rand_hc"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
dependencies = [
"rand_core",
]
[[package]]
name = "ryu"
version = "1.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e"
[[package]]
name = "serde"
version = "1.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_bytes"
version = "0.11.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9"
dependencies = [
"serde",
]
[[package]]
name = "serde_derive"
version = "1.0.118"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "serde_json"
version = "1.0.62"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea1c6153794552ea7cf7cf63b1231a25de00ec90db326ba6264440fa08e31486"
dependencies = [
"itoa",
"ryu",
"serde",
]
[[package]]
name = "syn"
version = "1.0.67"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6498a9efc342871f91cc2d0d694c674368b4ceb40f62b65a7a08c3792935e702"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
[[package]]
name = "time"
version = "0.1.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
dependencies = [
"libc",
"wasi 0.10.0+wasi-snapshot-preview1",
"winapi",
]
[[package]]
name = "unicode-xid"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
[[package]]
name = "uuid"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7"
dependencies = [
"getrandom 0.2.2",
]
[[package]]
name = "wasi"
version = "0.9.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
[[package]]
name = "wasi"
version = "0.10.0+wasi-snapshot-preview1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
[[package]]
name = "winapi"
version = "0.3.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
dependencies = [
"winapi-i686-pc-windows-gnu",
"winapi-x86_64-pc-windows-gnu",
]
[[package]]
name = "winapi-i686-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
[[package]]
name = "winapi-x86_64-pc-windows-gnu"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

View File

@ -1,15 +0,0 @@
[package]
name = "fce-cuckoo"
version = "0.1.0"
authors = ["boneyard93501 <4523011+boneyard93501@users.noreply.github.com>"]
edition = "2018"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies]
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.2", features = ["logger"] }
flate2 = "1.0.20"

View File

@ -1,13 +0,0 @@
#!/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
cd fce-cuckoo
cargo update
fce build --release
cd ..
rm -f artifacts/*
cp fce-cuckoo/target/wasm32-wasi/release/fce-cuckoo.wasm artifacts/

View File

@ -1,3 +0,0 @@
{
"name": "fce-cuckoo-2"
}

View File

@ -1,6 +0,0 @@
{
"name": "fce-cuckoo",
"mountedBinaries": None,
"preopenedFiles": None,
"mappedDirs" : None,
}

View File

@ -1,6 +0,0 @@
{
"name": "fce-cuckoo",
"mountedBinaries": None,
"preopenedFiles": None,
"mappedDirs" : None,
}