Skip to content

Commit abb7dc8

Browse files
DrPeterVanNostrandDrPeterVanNostrand
committed
feat: debug failing sdr porep test
1 parent 28e1172 commit abb7dc8

File tree

6 files changed

+210
-151
lines changed

6 files changed

+210
-151
lines changed

‎.circleci/config.yml

Lines changed: 149 additions & 147 deletions
Original file line numberDiff line numberDiff line change
@@ -187,10 +187,12 @@ jobs:
187187
ulimit -n 20000
188188
ulimit -u 20000
189189
ulimit -n 20000
190-
cargo +<< pipeline.parameters.nightly-toolchain >> test --all --verbose --release << parameters.cargo-args >> -- --nocapture << parameters.test-args >>
191-
cargo +<< pipeline.parameters.nightly-toolchain >> test test_seal_lifecycle_upgrade --verbose --release << parameters.cargo-args >> -- --nocapture --ignored
190+
# cargo +<< pipeline.parameters.nightly-toolchain >> test --all --verbose --release << parameters.cargo-args >> -- --nocapture << parameters.test-args >>
191+
cargo +<< pipeline.parameters.nightly-toolchain >> test --all --verbose --release test_stacked_porep_prove_verify << parameters.cargo-args >> -- --nocapture << parameters.test-args >>
192+
# cargo +<< pipeline.parameters.nightly-toolchain >> test test_seal_lifecycle_upgrade --verbose --release << parameters.cargo-args >> -- --nocapture --ignored
192193
no_output_timeout: 30m
193194
environment:
195+
RUST_BACKTRACE: 1
194196
FIL_PROOFS_USE_GPU_COLUMN_BUILDER: true
195197
FIL_PROOFS_USE_GPU_TREE_BUILDER: true
196198
BELLMAN_CUDA_NVCC_ARGS: --fatbin --gpu-architecture=sm_75 --generate-code=arch=compute_75,code=sm_75
@@ -371,58 +373,58 @@ workflows:
371373
jobs:
372374
- ensure_groth_parameters_and_keys_linux
373375
- cargo_fetch
374-
- rustfmt:
375-
requires:
376-
- cargo_fetch
377-
- clippy:
378-
requires:
379-
- cargo_fetch
380-
381-
- test_release:
382-
requires:
383-
- cargo_fetch
384-
- ensure_groth_parameters_and_keys_linux
385-
386-
- test_ignored_release:
387-
name: test_ignored_release_storage_proofs_post
388-
crate: "storage-proofs-post"
389-
requires:
390-
- cargo_fetch
391-
- ensure_groth_parameters_and_keys_linux
392-
393-
- test_ignored_release:
394-
name: test_ignored_release_storage_proofs_core
395-
crate: "storage-proofs-core"
396-
requires:
397-
- cargo_fetch
398-
- ensure_groth_parameters_and_keys_linux
399-
400-
- test_ignored_release:
401-
name: test_ignored_release_storage_proofs_porep
402-
crate: "storage-proofs-porep"
403-
requires:
404-
- cargo_fetch
405-
- ensure_groth_parameters_and_keys_linux
406-
407-
- test_ignored_release:
408-
name: test_ignored_release_filecoin_proofs
409-
crate: "filecoin-proofs"
410-
requires:
411-
- cargo_fetch
412-
- ensure_groth_parameters_and_keys_linux
413-
414-
- test_gpu_tree_building:
415-
name: test_gpu_tree_building_opencl (regular)
416-
requires:
417-
- cargo_fetch
418-
- ensure_groth_parameters_and_keys_linux
419-
420-
- test_gpu_tree_building:
421-
name: test_gpu_tree_building_opencl (ignored)
422-
test-args: "--ignored --skip test_seal_lifecycle_upgrade"
423-
requires:
424-
- cargo_fetch
425-
- ensure_groth_parameters_and_keys_linux
376+
# - rustfmt:
377+
# requires:
378+
# - cargo_fetch
379+
# - clippy:
380+
# requires:
381+
# - cargo_fetch
382+
#
383+
# - test_release:
384+
# requires:
385+
# - cargo_fetch
386+
# - ensure_groth_parameters_and_keys_linux
387+
#
388+
# - test_ignored_release:
389+
# name: test_ignored_release_storage_proofs_post
390+
# crate: "storage-proofs-post"
391+
# requires:
392+
# - cargo_fetch
393+
# - ensure_groth_parameters_and_keys_linux
394+
#
395+
# - test_ignored_release:
396+
# name: test_ignored_release_storage_proofs_core
397+
# crate: "storage-proofs-core"
398+
# requires:
399+
# - cargo_fetch
400+
# - ensure_groth_parameters_and_keys_linux
401+
#
402+
# - test_ignored_release:
403+
# name: test_ignored_release_storage_proofs_porep
404+
# crate: "storage-proofs-porep"
405+
# requires:
406+
# - cargo_fetch
407+
# - ensure_groth_parameters_and_keys_linux
408+
#
409+
# - test_ignored_release:
410+
# name: test_ignored_release_filecoin_proofs
411+
# crate: "filecoin-proofs"
412+
# requires:
413+
# - cargo_fetch
414+
# - ensure_groth_parameters_and_keys_linux
415+
#
416+
# - test_gpu_tree_building:
417+
# name: test_gpu_tree_building_opencl (regular)
418+
# requires:
419+
# - cargo_fetch
420+
# - ensure_groth_parameters_and_keys_linux
421+
#
422+
# - test_gpu_tree_building:
423+
# name: test_gpu_tree_building_opencl (ignored)
424+
# test-args: "--ignored --skip test_seal_lifecycle_upgrade"
425+
# requires:
426+
# - cargo_fetch
427+
# - ensure_groth_parameters_and_keys_linux
426428

427429
- test_gpu_tree_building:
428430
name: test_gpu_tree_building_cuda (regular)
@@ -431,96 +433,96 @@ workflows:
431433
- cargo_fetch
432434
- ensure_groth_parameters_and_keys_linux
433435

434-
- test_gpu_tree_building:
435-
name: test_gpu_tree_building_cuda (ignored)
436-
cargo-args: "--features cuda"
437-
test-args: "--ignored"
438-
requires:
439-
- cargo_fetch
440-
- ensure_groth_parameters_and_keys_linux
441-
442-
- test_multicore_sdr:
443-
requires:
444-
- cargo_fetch
445-
- ensure_groth_parameters_and_keys_linux
446-
447-
- test:
448-
name: test_filecoin_proofs
449-
crate: "filecoin-proofs"
450-
requires:
451-
- cargo_fetch
452-
- ensure_groth_parameters_and_keys_linux
453-
454-
- test:
455-
name: test_storage_proofs_core
456-
crate: "storage-proofs-core"
457-
requires:
458-
- cargo_fetch
459-
- ensure_groth_parameters_and_keys_linux
460-
461-
- test:
462-
name: test_storage_proofs_post
463-
crate: "storage-proofs-post"
464-
requires:
465-
- cargo_fetch
466-
- ensure_groth_parameters_and_keys_linux
467-
468-
- test:
469-
name: test_storage_proofs_porep
470-
crate: "storage-proofs-porep"
471-
requires:
472-
- cargo_fetch
473-
- ensure_groth_parameters_and_keys_linux
474-
475-
- test:
476-
name: test_fil_proofs_tooling
477-
crate: "fil-proofs-tooling"
478-
requires:
479-
- cargo_fetch
480-
- ensure_groth_parameters_and_keys_linux
481-
482-
- test:
483-
name: test_sha2raw
484-
crate: "sha2raw"
485-
requires:
486-
- cargo_fetch
487-
- ensure_groth_parameters_and_keys_linux
488-
489-
- test:
490-
name: test_filecoin_hashers
491-
crate: "filecoin-hashers"
492-
requires:
493-
- cargo_fetch
494-
- ensure_groth_parameters_and_keys_linux
495-
496-
497-
- test:
498-
name: test_fil_proofs_param
499-
crate: "fil-proofs-param"
500-
requires:
501-
- cargo_fetch
502-
- ensure_groth_parameters_and_keys_linux
503-
504-
- test_no_gpu:
505-
name: test_no_gpu
506-
requires:
507-
- cargo_fetch
508-
- ensure_groth_parameters_and_keys_linux
509-
510-
- test_arm_no_gpu:
511-
name: test_arm_no_gpu
512-
requires:
513-
- cargo_fetch
514-
- ensure_groth_parameters_and_keys_linux
515-
516-
- bench:
517-
requires:
518-
- cargo_fetch
519-
- ensure_groth_parameters_and_keys_linux
520-
- test_darwin
521-
522-
- test:
523-
name: test_fr32
524-
crate: "fr32"
525-
requires:
526-
- cargo_fetch
436+
# - test_gpu_tree_building:
437+
# name: test_gpu_tree_building_cuda (ignored)
438+
# cargo-args: "--features cuda"
439+
# test-args: "--ignored"
440+
# requires:
441+
# - cargo_fetch
442+
# - ensure_groth_parameters_and_keys_linux
443+
#
444+
# - test_multicore_sdr:
445+
# requires:
446+
# - cargo_fetch
447+
# - ensure_groth_parameters_and_keys_linux
448+
#
449+
# - test:
450+
# name: test_filecoin_proofs
451+
# crate: "filecoin-proofs"
452+
# requires:
453+
# - cargo_fetch
454+
# - ensure_groth_parameters_and_keys_linux
455+
#
456+
# - test:
457+
# name: test_storage_proofs_core
458+
# crate: "storage-proofs-core"
459+
# requires:
460+
# - cargo_fetch
461+
# - ensure_groth_parameters_and_keys_linux
462+
#
463+
# - test:
464+
# name: test_storage_proofs_post
465+
# crate: "storage-proofs-post"
466+
# requires:
467+
# - cargo_fetch
468+
# - ensure_groth_parameters_and_keys_linux
469+
#
470+
# - test:
471+
# name: test_storage_proofs_porep
472+
# crate: "storage-proofs-porep"
473+
# requires:
474+
# - cargo_fetch
475+
# - ensure_groth_parameters_and_keys_linux
476+
#
477+
# - test:
478+
# name: test_fil_proofs_tooling
479+
# crate: "fil-proofs-tooling"
480+
# requires:
481+
# - cargo_fetch
482+
# - ensure_groth_parameters_and_keys_linux
483+
#
484+
# - test:
485+
# name: test_sha2raw
486+
# crate: "sha2raw"
487+
# requires:
488+
# - cargo_fetch
489+
# - ensure_groth_parameters_and_keys_linux
490+
#
491+
# - test:
492+
# name: test_filecoin_hashers
493+
# crate: "filecoin-hashers"
494+
# requires:
495+
# - cargo_fetch
496+
# - ensure_groth_parameters_and_keys_linux
497+
#
498+
#
499+
# - test:
500+
# name: test_fil_proofs_param
501+
# crate: "fil-proofs-param"
502+
# requires:
503+
# - cargo_fetch
504+
# - ensure_groth_parameters_and_keys_linux
505+
#
506+
# - test_no_gpu:
507+
# name: test_no_gpu
508+
# requires:
509+
# - cargo_fetch
510+
# - ensure_groth_parameters_and_keys_linux
511+
#
512+
# - test_arm_no_gpu:
513+
# name: test_arm_no_gpu
514+
# requires:
515+
# - cargo_fetch
516+
# - ensure_groth_parameters_and_keys_linux
517+
#
518+
# - bench:
519+
# requires:
520+
# - cargo_fetch
521+
# - ensure_groth_parameters_and_keys_linux
522+
# - test_darwin
523+
#
524+
# - test:
525+
# name: test_fr32
526+
# crate: "fr32"
527+
# requires:
528+
# - cargo_fetch

‎storage-proofs-core/src/merkle/proof.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,13 @@ pub trait MerkleProofTrait: Clone + Serialize + DeserializeOwned + Debug + Sync
9393

9494
fn validate_data(&self, data: <Self::Hasher as Hasher>::Domain) -> bool {
9595
if !self.verify() {
96+
println!("\n\tMerkleProof.verify() failure");
9697
return false;
9798
}
9899

100+
if self.leaf() != data {
101+
println!("\n\tMerkleProof.verify() failure => self.leaf() != data");
102+
}
99103
self.leaf() == data
100104
}
101105

‎storage-proofs-porep/src/stacked/vanilla/column_proof.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,16 @@ impl<Proof: MerkleProofTrait> ColumnProof<Proof> {
4848
challenge: u32,
4949
expected_root: &<Proof::Hasher as Hasher>::Domain,
5050
) -> bool {
51+
println!("\n\t ColumnProof.verify => 1");
5152
let c_i = self.column_hash();
5253

54+
println!("\n\t ColumnProof.verify => 2");
5355
check_eq!(&self.inclusion_proof.root(), expected_root);
56+
println!("\n\t ColumnProof.verify => 3");
5457
check!(self.inclusion_proof.validate_data(c_i.into()));
58+
println!("\n\t ColumnProof.verify => 4");
5559
check!(self.inclusion_proof.validate(challenge as usize));
60+
println!("\n\t ColumnProof.verify => 5");
5661

5762
true
5863
}

0 commit comments

Comments
 (0)