Skip to content
This repository has been archived by the owner on Jun 8, 2022. It is now read-only.

Feat/sector importing api #80

Merged
merged 6 commits into from
Nov 5, 2019
Merged

Feat/sector importing api #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9725fdc
fix(modules): import types from new "types" module
laser Nov 5, 2019
bbca6fc
refactor(prefix): prefix reexported symbols with "reexported"
laser Nov 5, 2019
e5d7cd9
refactor(prefix): reexport proofs primitive ops
laser Nov 5, 2019
e6222aa
refactor(reexported): move reexported functions into their own file
laser Nov 5, 2019
5f1a492
feat(upstream): point to branch of rust-fil-proofs-ffi which has new …
laser Nov 5, 2019
72c9e64
fix(lock): update lockfile
laser Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 26 additions & 17 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 12 additions & 9 deletions sector-builder-ffi/examples/simple/plumbing.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub(crate) unsafe fn verify_post(
let flattened_comm_rs = proving_set.flattened_comm_rs();
let faulty_sector_ids = proving_set.faulty_sector_ids();

let resp = sector_builder_ffi_verify_post(
let resp = sector_builder_ffi_reexported_verify_post(
sector_size,
&mut challenge_seed.clone(),
sector_ids.as_ptr(),
Expand All @@ -59,7 +59,9 @@ pub(crate) unsafe fn verify_post(
proof.as_ptr(),
proof.len(),
);
defer!(sector_builder_ffi_destroy_verify_post_response(resp));
defer!(sector_builder_ffi_reexported_destroy_verify_post_response(
resp
));

if (*resp).status_code != 0 {
return Err((
Expand Down Expand Up @@ -200,13 +202,13 @@ pub(crate) unsafe fn generate_data_commitment(
sector_size: u64,
piece_info: &[sector_builder_ffi_FFIPublicPieceInfo],
) -> Result<[u8; 32], (sector_builder_ffi_FCPResponseStatus, String)> {
let resp = sector_builder_ffi_generate_data_commitment(
let resp = sector_builder_ffi_reexported_generate_data_commitment(
sector_size,
piece_info.as_ptr(),
piece_info.len(),
);
defer!(ctx.destructors.push(Box::new(move || {
sector_builder_ffi_destroy_generate_data_commitment_response(resp);
sector_builder_ffi_reexported_destroy_generate_data_commitment_response(resp);
})));

if (*resp).status_code != 0 {
Expand All @@ -228,9 +230,10 @@ pub(crate) unsafe fn generate_piece_commitment(
use std::os::unix::io::AsRawFd;
let c_piece_fd = piece_file.as_raw_fd();

let resp = sector_builder_ffi_generate_piece_commitment(c_piece_fd, piece_len as u64);
let resp =
sector_builder_ffi_reexported_generate_piece_commitment(c_piece_fd, piece_len as u64);
defer!(ctx.destructors.push(Box::new(move || {
sector_builder_ffi_destroy_generate_piece_commitment_response(resp);
sector_builder_ffi_reexported_destroy_generate_piece_commitment_response(resp);
})));

if (*resp).status_code != 0 {
Expand Down Expand Up @@ -340,7 +343,7 @@ pub(crate) unsafe fn verify_seal(
comm_d: [u8; 32],
prover_id: [u8; 32],
) -> Result<bool, (sector_builder_ffi_FCPResponseStatus, String)> {
let resp = sector_builder_ffi_verify_seal(
let resp = sector_builder_ffi_reexported_verify_seal(
sector_size,
&mut comm_r.clone(),
&mut comm_d.clone(),
Expand All @@ -352,7 +355,7 @@ pub(crate) unsafe fn verify_seal(
proof.len(),
);
defer!(ctx.destructors.push(Box::new(move || {
sector_builder_ffi_destroy_verify_seal_response(resp);
sector_builder_ffi_reexported_destroy_verify_seal_response(resp);
})));

if (*resp).status_code != 0 {
Expand All @@ -366,7 +369,7 @@ pub(crate) unsafe fn verify_seal(
}

pub(crate) unsafe fn get_max_user_bytes_per_staged_sector(sector_size: u64) -> u64 {
sector_builder_ffi_get_max_user_bytes_per_staged_sector(sector_size)
sector_builder_ffi_reexported_get_max_user_bytes_per_staged_sector(sector_size)
}

pub(crate) unsafe fn destroy_sector_builder(mut p: *mut sector_builder_ffi_SectorBuilder) {
Expand Down
Loading