Skip to content

Commit

Permalink
Initial Release 0.2 (#680)
Browse files Browse the repository at this point in the history
Initial Release 0.2
  • Loading branch information
dignifiedquire committed Jun 4, 2019
2 parents efc6b04 + 7a98618 commit 85c6301
Show file tree
Hide file tree
Showing 35 changed files with 163 additions and 320 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ Cargo.lock
**/*.h
heaptrack*
.bencher
logging-toolkit
*.profile
*.heap
rust-fil-proofs.config.toml
46 changes: 5 additions & 41 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,47 +1,11 @@
[package]
name = "proofs"
version = "0.1.0"
authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
license = "MIT OR Apache-2.0"

edition = "2018"

[dependencies]
filecoin-proofs = { path = "./filecoin-proofs" }
storage-proofs = { path = "./storage-proofs" }
sector-base = { path = "./sector-base" }
storage-backend = { path = "./storage-backend" }

clap = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
toml = "0.5"
failure = "0.1"
permutate = "0.3"
lazy_static = "1.2"
glob = "0.3"
human-size = "0.4"
prettytable-rs = "0.8"

[workspace]

members = [
"filecoin-proofs",
"storage-proofs",
"sector-base",
"storage-backend",
"ffi-toolkit"
"ffi-toolkit",
"fil-proofs-tooling",
"logging-toolkit",
"drop-struct-macro-derive"
]

[profile.test]
opt-level = 1

[profile.release]
debug = true

[features]
default = []
cpu-profile = ["filecoin-proofs/cpu-profile"]
heap-profile = ["filecoin-proofs/heap-profile"]
simd = ["storage-proofs/simd", "filecoin-proofs/simd"]
asm = ["storage-proofs/asm", "filecoin-proofs/asm"]
disk-trees = ["storage-proofs/disk-trees"]
6 changes: 5 additions & 1 deletion drop-struct-macro-derive/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
[package]
name = "drop_struct_macro_derive"
version = "0.1.0"
description = "A derive macro to free (drop) memory for structs that are used in the FFI."
version = "0.2.0"
authors = ["Volker Mische <volker.mische@gmail.com>"]
edition = "2018"
repository = "https://github.com/filecoin-project/rust-fil-proofs"
readme = "README.md"
license = "MIT OR Apache-2.0"

[lib]
proc-macro = true
Expand Down
2 changes: 1 addition & 1 deletion drop-struct-macro-derive/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Drop struct macro derive

A derive macro to free (drop) memory for structs that are used in the FFI.
> A derive macro to free (drop) memory for structs that are used in the FFI.
Currently only c-strings (`libc::c_char`) and arrays (represented as a pointer and a length field) are supported.

Expand Down
6 changes: 4 additions & 2 deletions ffi-toolkit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[package]
name = "ffi-toolkit"
version = "0.1.0"
description = "A collection of functions useful for working with the Rust FFI."
version = "0.2.0"
authors = ["laser <l@s3r.com>"]
license = "MIT OR Apache-2.0"

edition = "2018"
repository = "https://github.com/filecoin-project/rust-fil-proofs"
readme = "README.md"

[dependencies]
libc = "0.2"
11 changes: 11 additions & 0 deletions fil-proofs-tooling/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/target
**/*.rs.bk
Cargo.lock
.criterion
**/*.h
heaptrack*
.bencher
logging-toolkit
*.profile
*.heap
rust-fil-proofs.config.toml
22 changes: 22 additions & 0 deletions fil-proofs-tooling/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "fil-proofs-tooling"
description = "Tooling for rust-fil-proofs"
version = "0.2.0"
authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
license = "MIT OR Apache-2.0"
publish = false
edition = "2018"
repository = "https://github.com/filecoin-project/rust-fil-proofs"
readme = "README.md"

[dependencies]
clap = "2"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
toml = "0.5"
failure = "0.1"
permutate = "0.3"
lazy_static = "1.2"
glob = "0.3"
human-size = "0.4"
prettytable-rs = "0.8"
7 changes: 7 additions & 0 deletions fil-proofs-tooling/LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright (c) 2018 Filecoin Project

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
File renamed without changes.
1 change: 1 addition & 0 deletions fil-proofs-tooling/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# fil-proofs-tooling
4 changes: 4 additions & 0 deletions fil-proofs-tooling/release.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
disable-push = true
disable-publish = true
disable-tag = true
no-dev-version = true
File renamed without changes.
26 changes: 14 additions & 12 deletions filecoin-proofs/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
[package]
name = "filecoin-proofs"
version = "0.1.0"
authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
description = "The Filecoin specific aspects of storage-proofs, including a C based FFI, to generate and verify proofs."
version = "0.2.0"
authors = ["dignifiedquire <dignifiedquire@gmail.com>", "laser <l@s3r.com>", "porcuquine <porcuquine@users.noreply.github.com>"]
license = "MIT OR Apache-2.0"

edition = "2018"
repository = "https://github.com/filecoin-project/rust-fil-proofs"
readme = "README.md"

[lib]
crate-type = ["rlib", "staticlib", "cdylib"]

[dependencies]
sector-base = { path = "../sector-base" }
storage-proofs = { path = "../storage-proofs" }
ffi-toolkit = { path = "../ffi-toolkit" }
logging-toolkit = { path = "../logging-toolkit" }
bitvec = "0.10"
sector-base = { version = "^0.2", path = "../sector-base" }
storage-proofs = { version = "^0.2", path = "../storage-proofs" }
ffi-toolkit = { version = "^0.2", path = "../ffi-toolkit" }
logging-toolkit = { version = "^0.2", path = "../logging-toolkit" }
bitvec = "0.11"
chrono = "0.4"
rand = "0.4"
libc = "0.2"
Expand All @@ -32,7 +34,7 @@ serde = { version = "1", features = ["rc", "derive"] }
serde_json = "1.0"
slog = { version = "2.4.1", features = ["max_level_trace", "release_max_level_trace"] }
regex = "1"
drop_struct_macro_derive = { path = "../drop-struct-macro-derive" }
drop_struct_macro_derive = { version = "^0.2", path = "../drop-struct-macro-derive" }
ff = "0.4.0"
blake2b_simd = "0.5"
phase21 = "0.3"
Expand All @@ -41,11 +43,11 @@ paired = "0.15"
fil-sapling-crypto = "0.1"

[dependencies.sled]
version = "0.23.0"
version = "0.24"
optional = true

[dependencies.reqwest]
version = "0.9.16"
version = "0.9"
default-features = false
features = ["default-tls-vendored"]

Expand All @@ -54,7 +56,7 @@ gperftools = "0.2"
scopeguard = "1.0"

[build-dependencies]
bindgen = "0.47"
bindgen = "0.49"
cbindgen = "0.8"

[features]
Expand Down
3 changes: 1 addition & 2 deletions filecoin-proofs/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
# Filecoin Proofs

This crate contains the Filecoin specific aspects, including a C based FFI, to generate
and verify proofs.
> The Filecoin specific aspects of `storage-proofs`, including a C based FFI, to generate and verify proofs.

## License
Expand Down
10 changes: 10 additions & 0 deletions logging-toolkit/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
/target
**/*.rs.bk
Cargo.lock
.criterion
**/*.h
heaptrack*
.bencher
*.profile
*.heap
rust-fil-proofs.config.toml
6 changes: 4 additions & 2 deletions logging-toolkit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
[package]
name = "logging-toolkit"
version = "0.1.0"
description = "Logging utilities"
version = "0.2.0"
authors = ["laser <l@s3r.com>"]
license = "MIT OR Apache-2.0"

repository = "https://github.com/filecoin-project/rust-fil-proofs"
readme = "README.md"
edition = "2018"

[dependencies]
Expand Down
7 changes: 7 additions & 0 deletions logging-toolkit/LICENSE-APACHE
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
Copyright (c) 2018 Filecoin Project

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
23 changes: 23 additions & 0 deletions logging-toolkit/LICENSE-MIT
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Permission is hereby granted, free of charge, to any
person obtaining a copy of this software and associated
documentation files (the "Software"), to deal in the
Software without restriction, including without
limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software
is furnished to do so, subject to the following
conditions:

The above copyright notice and this permission notice
shall be included in all copies or substantial portions
of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF
ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED
TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
7 changes: 7 additions & 0 deletions logging-toolkit/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# logging-toolkit

> Logging utilities
## License

MIT or Apache 2.0
3 changes: 3 additions & 0 deletions release.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
pre-release-commit-message = "chore({{crate_name}}): release {{version}}"
pro-release-commit-message = "chore({{crate_name}}): starting development cycle for {{next_version}}"
no-dev-version = true
21 changes: 14 additions & 7 deletions sector-base/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,24 +1,31 @@
[package]
name = "sector-base"
version = "0.1.0"
authors = ["dignifiedquire <dignifiedquire@gmail.com>"]
description = "Provides a database of sectors."
version = "0.2.0"
authors = ["dignifiedquire <dignifiedquire@gmail.com>", "laser <l@s3r.com>", "porcuquine <porcuquine@users.noreply.github.com>"]
license = "MIT OR Apache-2.0"

edition = "2018"
repository = "https://github.com/filecoin-project/rust-fil-proofs"
readme = "README.md"

[dependencies]
bitvec = "0.10"
bitvec = "0.11"
failure = "0.1"
itertools = "0.8"
libc = "0.2"
rand = "0.4"
storage-proofs = { path = "../storage-proofs" }
ffi-toolkit = { path = "../ffi-toolkit" }
storage-proofs = { version = "^0.2", path = "../storage-proofs" }
ffi-toolkit = { version = "^0.2", path = "../ffi-toolkit" }
serde_cbor = "0.9.0"
serde = { version = "1", features = ["rc", "derive"] }
serde_json = "1.0"
paired = "0.15"


[dev-dependencies]
tempfile = "*"
tempfile = "3"
criterion = "0.2"

[[bench]]
name = "preprocessing"
harness = false
File renamed without changes.
6 changes: 3 additions & 3 deletions sector-base/src/io/fr32.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::cmp::min;
use std::io::{self, Error, ErrorKind, Read, Seek, SeekFrom, Write};

use bitvec::{self, BitVec, LittleEndian};
use bitvec::prelude::*;

/** PaddingMap represents a mapping between data and its padded equivalent.
Expand Down Expand Up @@ -1072,8 +1072,8 @@ mod tests {
// it for some corner cases, but since largely this implementation
// has been replaced it seems reasonable.
fn bit_vec_padding(raw_data: Vec<u8>) -> Box<[u8]> {
let mut padded_data: BitVec<bitvec::LittleEndian, u8> = BitVec::new();
let raw_data: BitVec<bitvec::LittleEndian, u8> = BitVec::from(raw_data);
let mut padded_data: BitVec<LittleEndian, u8> = BitVec::new();
let raw_data: BitVec<LittleEndian, u8> = BitVec::from(raw_data);

for data_unit in raw_data
.into_iter()
Expand Down
1 change: 0 additions & 1 deletion src/lib.rs

This file was deleted.

6 changes: 0 additions & 6 deletions storage-backend/.gitignore

This file was deleted.

9 changes: 0 additions & 9 deletions storage-backend/Cargo.toml

This file was deleted.

Loading

0 comments on commit 85c6301

Please sign in to comment.