cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

update ffi

Browse Source
This commit is contained in:
Łukasz Magiera 2021-05-18 12:46:13 +02:00
parent e56960f245
commit fe9311e435
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extern/filecoin-ffi vendored

@ -1 +1 @@
Subproject commit 525851103fcf548dff1d4db6b5a1a2a6d9e10833 Subproject commit 178ac15a537626cac07d8af68bffc603011c0310

11
extern/sector-storage/ffiwrapper/sealer_test.go vendored
View File

@ -513,8 +513,11 @@ func TestSealAndVerifyAggregate(t *testing.T) {
defer cleanup() defer cleanup()
avi := proof5.AggregateSealVerifyProofAndInfos{ avi := proof5.AggregateSealVerifyProofAndInfos{
Miner: miner, Miner: miner,
Infos: make([]proof5.AggregateSealVerifyInfo, numAgg), SealProof: sealProofType,
AggregateProof: policy.GetDefaultAggregationProof(),
Proof: nil,
Infos: make([]proof5.AggregateSealVerifyInfo, numAgg),
} }
toAggregate := make([][]byte, numAgg) toAggregate := make([][]byte, numAgg)
@ -539,12 +542,12 @@ func TestSealAndVerifyAggregate(t *testing.T) {
aggStart := time.Now() aggStart := time.Now()
avi.Proof, err = ProofVerifier.AggregateSealProofs(sealProofType, policy.GetDefaultAggregationProof(), toAggregate) avi.Proof, err = ProofVerifier.AggregateSealProofs(avi, toAggregate)
require.NoError(t, err) require.NoError(t, err)
aggDone := time.Now() aggDone := time.Now()
_, err = ProofVerifier.AggregateSealProofs(sealProofType, policy.GetDefaultAggregationProof(), toAggregate) _, err = ProofVerifier.AggregateSealProofs(avi, toAggregate)
require.NoError(t, err) require.NoError(t, err)
aggHot := time.Now() aggHot := time.Now()

2
extern/sector-storage/ffiwrapper/types.go vendored
View File

@ -42,7 +42,7 @@ type Verifier interface {
GenerateWinningPoStSectorChallenge(context.Context, abi.RegisteredPoStProof, abi.ActorID, abi.PoStRandomness, uint64) ([]uint64, error) GenerateWinningPoStSectorChallenge(context.Context, abi.RegisteredPoStProof, abi.ActorID, abi.PoStRandomness, uint64) ([]uint64, error)
// cheap, makes no sense to put this on the storage interface // cheap, makes no sense to put this on the storage interface
AggregateSealProofs(proofType abi.RegisteredSealProof, rap abi.RegisteredAggregationProof, proofs [][]byte) ([]byte, error) AggregateSealProofs(aggregateInfo proof5.AggregateSealVerifyProofAndInfos, proofs [][]byte) ([]byte, error)
} }
type SectorProvider interface { type SectorProvider interface {

4
extern/sector-storage/ffiwrapper/verifier_cgo.go vendored
View File

@ -140,6 +140,6 @@ func (proofVerifier) GenerateWinningPoStSectorChallenge(ctx context.Context, pro
return ffi.GenerateWinningPoStSectorChallenge(proofType, minerID, randomness, eligibleSectorCount) return ffi.GenerateWinningPoStSectorChallenge(proofType, minerID, randomness, eligibleSectorCount)
} }
func (v proofVerifier) AggregateSealProofs(proofType abi.RegisteredSealProof, rap abi.RegisteredAggregationProof, proofs [][]byte) ([]byte, error) { func (v proofVerifier) AggregateSealProofs(aggregateInfo proof5.AggregateSealVerifyProofAndInfos, proofs [][]byte) ([]byte, error) {
return ffi.AggregateSealProofs(proofType, rap, proofs) return ffi.AggregateSealProofs(aggregateInfo, proofs)
} }