Skip to content

Commit d6a5a9e

Browse files
authored
Update go-sectorbuilder to latest that uses specs-actors types (#121)
* fix(deps): update filecoin-ffi * feat(deps): update ffi+sectorbuilder use spec-actors lower level types
1 parent 871d7b0 commit d6a5a9e

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

pieceio/pieceio.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/filecoin-project/go-padreader"
1010
"github.com/filecoin-project/go-sectorbuilder"
11+
"github.com/filecoin-project/specs-actors/actors/abi"
1112
"github.com/ipfs/go-cid"
1213
blockstore "github.com/ipfs/go-ipfs-blockstore"
1314
"github.com/ipld/go-ipld-prime"
@@ -50,7 +51,7 @@ func NewPieceIOWithStore(carIO CarIO, store filestore.FileStore, bs blockstore.B
5051
return &pieceIOWithStore{pieceIO{carIO, bs}, store}
5152
}
5253

53-
func (pio *pieceIO) GeneratePieceCommitment(payloadCid cid.Cid, selector ipld.Node) ([]byte, uint64, error) {
54+
func (pio *pieceIO) GeneratePieceCommitment(payloadCid cid.Cid, selector ipld.Node) ([]byte, abi.UnpaddedPieceSize, error) {
5455
preparedCar, err := pio.carIO.PrepareCar(context.Background(), pio.bs, payloadCid, selector)
5556
if err != nil {
5657
return nil, 0, err
@@ -86,7 +87,7 @@ func (pio *pieceIO) GeneratePieceCommitment(payloadCid cid.Cid, selector ipld.No
8687
return commitment, paddedSize, nil
8788
}
8889

89-
func (pio *pieceIOWithStore) GeneratePieceCommitmentToFile(payloadCid cid.Cid, selector ipld.Node) ([]byte, filestore.Path, uint64, error) {
90+
func (pio *pieceIOWithStore) GeneratePieceCommitmentToFile(payloadCid cid.Cid, selector ipld.Node) ([]byte, filestore.Path, abi.UnpaddedPieceSize, error) {
9091
f, err := pio.store.CreateTemp()
9192
if err != nil {
9293
return nil, "", 0, err
@@ -115,7 +116,7 @@ func (pio *pieceIOWithStore) GeneratePieceCommitmentToFile(payloadCid cid.Cid, s
115116
return commitment, f.Path(), paddedSize, nil
116117
}
117118

118-
func GeneratePieceCommitment(rd io.Reader, pieceSize uint64) ([]byte, uint64, error) {
119+
func GeneratePieceCommitment(rd io.Reader, pieceSize uint64) ([]byte, abi.UnpaddedPieceSize, error) {
119120
paddedReader, paddedSize := padreader.New(rd, pieceSize)
120121
commitment, err := sectorbuilder.GeneratePieceCommitment(paddedReader, paddedSize)
121122
if err != nil {

pieceio/types.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import (
44
"io"
55

66
"github.com/filecoin-project/go-fil-markets/filestore"
7+
"github.com/filecoin-project/specs-actors/actors/abi"
78

89
blocks "github.com/ipfs/go-block-format"
910
"github.com/ipfs/go-cid"
@@ -20,11 +21,11 @@ type ReadStore interface {
2021

2122
// PieceIO converts between payloads and pieces
2223
type PieceIO interface {
23-
GeneratePieceCommitment(payloadCid cid.Cid, selector ipld.Node) ([]byte, uint64, error)
24+
GeneratePieceCommitment(payloadCid cid.Cid, selector ipld.Node) ([]byte, abi.UnpaddedPieceSize, error)
2425
ReadPiece(r io.Reader) (cid.Cid, error)
2526
}
2627

2728
type PieceIOWithStore interface {
2829
PieceIO
29-
GeneratePieceCommitmentToFile(payloadCid cid.Cid, selector ipld.Node) ([]byte, filestore.Path, uint64, error)
30+
GeneratePieceCommitmentToFile(payloadCid cid.Cid, selector ipld.Node) ([]byte, filestore.Path, abi.UnpaddedPieceSize, error)
3031
}

0 commit comments

Comments
 (0)