remove window-size-nodes

Author: dignifiedquire

.circleci/config.yml

@@ -166,7 +166,7 @@ commands:
     steps:
       - run:
           name: Obtain filecoin groth parameters
-          command: ./paramcache --params-for-sector-sizes='1024:16'
+          command: ./paramcache --params-for-sector-sizes='1024'
           no_output_timeout: 60m
   build_project:
     steps:

proofs.go

@@ -170,7 +170,6 @@ type PublicPieceInfo struct {
 // derived was valid, and false if not.
 func VerifySeal(
 	sectorSize uint64,
-	windowSizeNodes uint32,
 	commR [CommitmentBytesLen]byte,
 	commD [CommitmentBytesLen]byte,
 	proverID [32]byte,
@@ -201,7 +200,6 @@ func VerifySeal(
 	// a mutable pointer to a VerifySealResponse C-struct
 	resPtr := C.verify_seal(
 		C.uint64_t(sectorSize),
-		C.uint32_t(windowSizeNodes),
 		(*[CommitmentBytesLen]C.uint8_t)(commRCBytes),
 		(*[CommitmentBytesLen]C.uint8_t)(commDCBytes),
 		(*[32]C.uint8_t)(proverIDCBytes),
@@ -224,7 +222,6 @@ func VerifySeal(
 // inputs were derived was valid, and false if not.
 func VerifyPoSt(
 	sectorSize uint64,
-	windowSizeNodes uint32,
 	sectorInfo SortedPublicSectorInfo,
 	randomness [32]byte,
 	challengeCount uint64,
@@ -270,7 +267,6 @@ func VerifyPoSt(
 	// a mutable pointer to a VerifyPoStResponse C-struct
 	resPtr := C.verify_post(
 		C.uint64_t(sectorSize),
-		C.uint32_t(windowSizeNodes),
 		(*[32]C.uint8_t)(randomnessCBytes),
 		C.uint64_t(challengeCount),
 		sectorIdsPtr,
@@ -312,11 +308,11 @@ func GeneratePieceCommitment(piecePath string, pieceSize uint64) ([CommitmentByt
 
 // GenerateDataCommitment produces a commitment for the sector containing the
 // provided pieces.
-func GenerateDataCommitment(sectorSize uint64, windowSizeNodes uint32, pieces []PublicPieceInfo) ([CommitmentBytesLen]byte, error) {
+func GenerateDataCommitment(sectorSize uint64, pieces []PublicPieceInfo) ([CommitmentBytesLen]byte, error) {
 	cPiecesPtr, cPiecesLen := cPublicPieceInfo(pieces)
 	defer C.free(unsafe.Pointer(cPiecesPtr))
 
-	resPtr := C.generate_data_commitment(C.uint64_t(sectorSize), C.uint32_t(windowSizeNodes), (*C.FFIPublicPieceInfo)(cPiecesPtr), cPiecesLen)
+	resPtr := C.generate_data_commitment(C.uint64_t(sectorSize), (*C.FFIPublicPieceInfo)(cPiecesPtr), cPiecesLen)
 	defer C.destroy_generate_data_commitment_response(resPtr)
 
 	if resPtr.status_code != 0 {
@@ -405,7 +401,6 @@ func WriteWithoutAlignment(
 // SealPreCommit
 func SealPreCommit(
 	sectorSize uint64,
-	windowSizeNodes uint32,
 	poRepProofPartitions uint8,
 	cacheDirPath string,
 	stagedSectorPath string,
@@ -434,7 +429,7 @@ func SealPreCommit(
 	defer C.free(unsafe.Pointer(cPiecesPtr))
 
 	resPtr := C.seal_pre_commit(
-		cSectorClass(sectorSize, poRepProofPartitions, windowSizeNodes),
+		cSectorClass(sectorSize, poRepProofPartitions),
 		cCacheDirPath,
 		cStagedSectorPath,
 		cSealedSectorPath,
@@ -456,7 +451,6 @@ func SealPreCommit(
 // SealCommit
 func SealCommit(
 	sectorSize uint64,
-	windowSizeNodes uint32,
 	poRepProofPartitions uint8,
 	cacheDirPath string,
 	sectorID uint64,
@@ -482,7 +476,7 @@ func SealCommit(
 	defer C.free(unsafe.Pointer(cPiecesPtr))
 
 	resPtr := C.seal_commit(
-		cSectorClass(sectorSize, poRepProofPartitions, windowSizeNodes),
+		cSectorClass(sectorSize, poRepProofPartitions),
 		cCacheDirPath,
 		C.uint64_t(sectorID),
 		(*[32]C.uint8_t)(proverIDCBytes),
@@ -504,7 +498,6 @@ func SealCommit(
 // Unseal
 func Unseal(
 	sectorSize uint64,
-	windowSizeNodes uint32,
 	poRepProofPartitions uint8,
 	cacheDirPath string,
 	sealedSectorPath string,
@@ -533,7 +526,7 @@ func Unseal(
 	defer C.free(commDCBytes)
 
 	resPtr := C.unseal(
-		cSectorClass(sectorSize, poRepProofPartitions, windowSizeNodes),
+		cSectorClass(sectorSize, poRepProofPartitions),
 		cCacheDirPath,
 		cSealedSectorPath,
 		cUnsealOutputPath,
@@ -569,7 +562,6 @@ func FinalizeTicket(partialTicket [32]byte) ([32]byte, error) {
 // GenerateCandidates
 func GenerateCandidates(
 	sectorSize uint64,
-	windowSizeNodes uint32,
 	proverID [32]byte,
 	randomness [32]byte,
 	challengeCount uint64,
@@ -586,7 +578,6 @@ func GenerateCandidates(
 
 	resPtr := C.generate_candidates(
 		C.uint64_t(sectorSize),
-		C.uint32_t(windowSizeNodes),
 		(*[32]C.uint8_t)(randomessCBytes),
 		C.uint64_t(challengeCount),
 		replicasPtr,
@@ -605,7 +596,6 @@ func GenerateCandidates(
 // GeneratePoSt
 func GeneratePoSt(
 	sectorSize uint64,
-	windowSizeNodes uint32,
 	proverID [32]byte,
 	privateSectorInfo SortedPrivateSectorInfo,
 	randomness [32]byte,
@@ -622,7 +612,6 @@ func GeneratePoSt(
 
 	resPtr := C.generate_post(
 		C.uint64_t(sectorSize),
-		C.uint32_t(windowSizeNodes),
 		(*[32]C.uint8_t)(unsafe.Pointer(&(randomness)[0])),
 		replicasPtr,
 		replicasSize,
@@ -677,11 +666,10 @@ func cUint64s(src []uint64) (*C.uint64_t, C.size_t) {
 	return (*C.uint64_t)(cUint64s), srcCSizeT
 }
 
-func cSectorClass(sectorSize uint64, poRepProofPartitions uint8, windowSizeNodes uint32) C.FFISectorClass {
+func cSectorClass(sectorSize uint64, poRepProofPartitions uint8) C.FFISectorClass {
 	return C.FFISectorClass{
 		sector_size:            C.uint64_t(sectorSize),
 		porep_proof_partitions: C.uint8_t(poRepProofPartitions),
-		window_size_nodes:      C.uint32_t(windowSizeNodes),
 	}
 }
 

proofs_test.go

@@ -21,7 +21,6 @@ func TestImportSector(t *testing.T) {
 	proverID := [32]byte{6, 7, 8}
 	randomness := [32]byte{9, 9, 9}
 	sectorSize := uint64(1024)
-	windowSizeNodes := uint32(16)
 	sectorID := uint64(42)
 
 	ticket := SealTicket{
@@ -107,7 +106,7 @@ func TestImportSector(t *testing.T) {
 		CommP: commPB,
 	}}
 
-	commD, err := GenerateDataCommitment(sectorSize, windowSizeNodes, publicPieces)
+	commD, err := GenerateDataCommitment(sectorSize, publicPieces)
 	require.NoError(t, err)
 
 	privatePieces := make([]PieceMetadata, len(publicPieces))
@@ -120,22 +119,22 @@ func TestImportSector(t *testing.T) {
 	}
 
 	// pre-commit the sector
-	output, err := SealPreCommit(sectorSize, windowSizeNodes, poRepProofPartitions, sectorCacheDirPath, stagedSectorFile.Name(), sealedSectorFile.Name(), sectorID, proverID, ticket.TicketBytes, publicPieces)
+	output, err := SealPreCommit(sectorSize, poRepProofPartitions, sectorCacheDirPath, stagedSectorFile.Name(), sealedSectorFile.Name(), sectorID, proverID, ticket.TicketBytes, publicPieces)
 	require.NoError(t, err)
 
 	require.Equal(t, output.CommD, commD, "prover and verifier should agree on data commitment")
 
 	// commit the sector
-	proof, err := SealCommit(sectorSize, windowSizeNodes, poRepProofPartitions, sectorCacheDirPath, sectorID, proverID, ticket.TicketBytes, seed.TicketBytes, publicPieces, output)
+	proof, err := SealCommit(sectorSize, poRepProofPartitions, sectorCacheDirPath, sectorID, proverID, ticket.TicketBytes, seed.TicketBytes, publicPieces, output)
 	require.NoError(t, err)
 
 	// verify the 'ole proofy
-	isValid, err := VerifySeal(sectorSize, windowSizeNodes, output.CommR, output.CommD, proverID, ticket.TicketBytes, seed.TicketBytes, sectorID, proof)
+	isValid, err := VerifySeal(sectorSize, output.CommR, output.CommD, proverID, ticket.TicketBytes, seed.TicketBytes, sectorID, proof)
 	require.NoError(t, err)
 	require.True(t, isValid, "proof wasn't valid")
 
 	// unseal and verify that things went as we planned
-	require.NoError(t, Unseal(sectorSize, windowSizeNodes, poRepProofPartitions, sectorCacheDirPath, sealedSectorFile.Name(), unsealOutputFile.Name(), sectorID, proverID, ticket.TicketBytes, output.CommD))
+	require.NoError(t, Unseal(sectorSize, poRepProofPartitions, sectorCacheDirPath, sealedSectorFile.Name(), unsealOutputFile.Name(), sectorID, proverID, ticket.TicketBytes, output.CommD))
 	contents, err := ioutil.ReadFile(unsealOutputFile.Name())
 	require.NoError(t, err)
 
@@ -171,18 +170,18 @@ func TestImportSector(t *testing.T) {
 		CommR:    output.CommR,
 	})
 
-	candidatesA, err := GenerateCandidates(sectorSize, windowSizeNodes, proverID, randomness, challengeCount, privateInfo)
+	candidatesA, err := GenerateCandidates(sectorSize, proverID, randomness, challengeCount, privateInfo)
 	require.NoError(t, err)
 
 	// finalize the ticket, but don't do anything with the results (simply
 	// exercise the API)
 	_, err = FinalizeTicket(candidatesA[0].PartialTicket)
 	require.NoError(t, err)
 
-	proofA, err := GeneratePoSt(sectorSize, windowSizeNodes, proverID, privateInfo, randomness, candidatesA)
+	proofA, err := GeneratePoSt(sectorSize, proverID, privateInfo, randomness, candidatesA)
 	require.NoError(t, err)
 
-	isValid, err = VerifyPoSt(sectorSize, windowSizeNodes, publicInfo, randomness, challengeCount, proofA, candidatesA, proverID)
+	isValid, err = VerifyPoSt(sectorSize, publicInfo, randomness, challengeCount, proofA, candidatesA, proverID)
 	require.NoError(t, err)
 	require.True(t, isValid, "VerifyPoSt rejected the (standalone) proof as invalid")
 }

rust/Cargo.lock

@@ -13,8 +13,8 @@ publish = false
 crate-type = ["rlib", "staticlib"]
 
 [dependencies]
-filecoin-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "master" }
-storage-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "master" }
+filecoin-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "simpler-windows" }
+storage-proofs = { git = "https://github.com/filecoin-project/rust-fil-proofs.git", branch = "simpler-windows" }
 bls-signatures = { git = "https://github.com/filecoin-project/bls-signatures.git", branch = "master" }
 byteorder = "1.2"
 drop_struct_macro_derive = "0.4.0"