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

Tweak mock ProveCommits to respect proof sizes

Browse Source
This commit is contained in:
Aayush Rajasekaran 2021-02-19 16:08:43 -05:00
parent df32f5d060
commit 6732758d0f
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/test/tape.go
View File

@ -18,7 +18,9 @@ import (
) )
func TestTapeFix(t *testing.T, b APIBuilder, blocktime time.Duration) { func TestTapeFix(t *testing.T, b APIBuilder, blocktime time.Duration) {
t.Run("before", func(t *testing.T) { testTapeFix(t, b, blocktime, false) }) // The "before" case is disabled, because we need the builder to mock 32 GiB sectors to accurately repro this case
// TODO: Make the mock sector size configurable and reenable this
//t.Run("before", func(t *testing.T) { testTapeFix(t, b, blocktime, false) })
t.Run("after", func(t *testing.T) { testTapeFix(t, b, blocktime, true) }) t.Run("after", func(t *testing.T) { testTapeFix(t, b, blocktime, true) })
} }
func testTapeFix(t *testing.T, b APIBuilder, blocktime time.Duration, after bool) { func testTapeFix(t *testing.T, b APIBuilder, blocktime time.Duration, after bool) {

14
extern/sector-storage/mock/mock.go vendored
View File

@ -236,7 +236,12 @@ func (mgr *SectorMgr) SealCommit1(ctx context.Context, sid storage.SectorRef, ti
} }
func (mgr *SectorMgr) SealCommit2(ctx context.Context, sid storage.SectorRef, phase1Out storage.Commit1Out) (proof storage.Proof, err error) { func (mgr *SectorMgr) SealCommit2(ctx context.Context, sid storage.SectorRef, phase1Out storage.Commit1Out) (proof storage.Proof, err error) {
var out [1920]byte plen, err := sid.ProofType.ProofSize()
if err != nil {
return nil, err
}
out := make([]byte, plen)
for i := range out[:len(phase1Out)] { for i := range out[:len(phase1Out)] {
out[i] = phase1Out[i] ^ byte(sid.ID.Number&0xff) out[i] = phase1Out[i] ^ byte(sid.ID.Number&0xff)
} }
@ -464,7 +469,12 @@ func (mgr *SectorMgr) ReturnFetch(ctx context.Context, callID storiface.CallID,
} }
func (m mockVerif) VerifySeal(svi proof2.SealVerifyInfo) (bool, error) { func (m mockVerif) VerifySeal(svi proof2.SealVerifyInfo) (bool, error) {
if len(svi.Proof) != 1920 { plen, err := svi.SealProof.ProofSize()
if err != nil {
return false, err
}
if len(svi.Proof) != int(plen) {
return false, nil return false, nil
} }