Skip to content

Commit 7804bd3

Browse files
authored
refactor: remove specs-storage dependency, use Lotus storiface instead (#1248)
* Remove specs-storage dependency * Remvoe sectorblocks.go * Fix go modules
1 parent 4f2fe56 commit 7804bd3

File tree

4 files changed

+3
-183
lines changed

4 files changed

+3
-183
lines changed

go.mod

+1-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ require (
3838
github.com/filecoin-project/go-statestore v0.2.0
3939
github.com/filecoin-project/lotus v1.20.3-boost
4040
github.com/filecoin-project/specs-actors v0.9.15
41-
github.com/filecoin-project/specs-storage v0.4.1
4241
github.com/gbrlsnchs/jwt/v3 v3.0.1
4342
github.com/golang/mock v1.6.0
4443
github.com/google/uuid v1.3.0
@@ -56,7 +55,7 @@ require (
5655
github.com/ipfs/go-ipfs-blockstore v1.2.0
5756
github.com/ipfs/go-ipfs-blocksutil v0.0.1
5857
github.com/ipfs/go-ipfs-chunker v0.0.5
59-
github.com/ipfs/go-ipfs-ds-help v1.1.0
58+
github.com/ipfs/go-ipfs-ds-help v1.1.0 // indirect
6059
github.com/ipfs/go-ipfs-exchange-interface v0.2.0
6160
github.com/ipfs/go-ipfs-exchange-offline v0.3.0
6261
github.com/ipfs/go-ipfs-files v0.1.1

go.sum

-3
Original file line numberDiff line numberDiff line change
@@ -392,7 +392,6 @@ github.com/filecoin-project/go-state-types v0.0.0-20200903145444-247639ffa6ad/go
392392
github.com/filecoin-project/go-state-types v0.0.0-20200928172055-2df22083d8ab/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
393393
github.com/filecoin-project/go-state-types v0.0.0-20201102161440-c8033295a1fc/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
394394
github.com/filecoin-project/go-state-types v0.1.0/go.mod h1:ezYnPf0bNkTsDibL/psSz5dy4B5awOJ/E7P2Saeep8g=
395-
github.com/filecoin-project/go-state-types v0.1.4/go.mod h1:xCA/WfKlC2zcn3fUmDv4IrzznwS98X5XW/irUP3Lhxg=
396395
github.com/filecoin-project/go-state-types v0.1.6/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
397396
github.com/filecoin-project/go-state-types v0.1.8/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
398397
github.com/filecoin-project/go-state-types v0.1.10/go.mod h1:UwGVoMsULoCK+bWjEdd/xLCvLAQFBC7EDT477SKml+Q=
@@ -428,8 +427,6 @@ github.com/filecoin-project/specs-actors/v7 v7.0.1 h1:w72xCxijK7xs1qzmJiw+WYJaVt
428427
github.com/filecoin-project/specs-actors/v7 v7.0.1/go.mod h1:tPLEYXoXhcpyLh69Ccq91SOuLXsPWjHiY27CzawjUEk=
429428
github.com/filecoin-project/specs-actors/v8 v8.0.1 h1:4u0tIRJeT5G7F05lwLRIsDnsrN+bJ5Ixj6h49Q7uE2Y=
430429
github.com/filecoin-project/specs-actors/v8 v8.0.1/go.mod h1:UYIPg65iPWoFw5NEftREdJwv9b/5yaLKdCgTvNI/2FA=
431-
github.com/filecoin-project/specs-storage v0.4.1 h1:yvLEaLZj8f+uByhNC4mFOtCUyL2wQku+NGBp6hjTe9M=
432-
github.com/filecoin-project/specs-storage v0.4.1/go.mod h1:Z2eK6uMwAOSLjek6+sy0jNV2DSsMEENziMUz0GHRFBw=
433430
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc=
434431
github.com/flynn/noise v0.0.0-20180327030543-2492fe189ae6/go.mod h1:1i71OnUq3iUe1ma7Lr6yG6/rjvM3emb6yoL7xLFzcVQ=
435432
github.com/flynn/noise v1.0.0 h1:DlTHqmzmvcEiKj+4RYo/imoswx/4r6iBlCMfVtrMXpQ=

storage/sectorblocks/sectorblocks.go

-176
This file was deleted.

storagemarket/types/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/filecoin-project/go-state-types/builtin/v9/market"
1717
"github.com/filecoin-project/go-state-types/crypto"
1818
"github.com/filecoin-project/lotus/api"
19-
"github.com/filecoin-project/specs-storage/storage"
19+
"github.com/filecoin-project/lotus/storage/sealer/storiface"
2020
"github.com/google/uuid"
2121
"github.com/ipfs/go-cid"
2222
)
@@ -146,7 +146,7 @@ type PieceAdder interface {
146146
}
147147

148148
type CommpCalculator interface {
149-
ComputeDataCid(ctx context.Context, pieceSize abi.UnpaddedPieceSize, pieceData storage.Data) (abi.PieceInfo, error)
149+
ComputeDataCid(ctx context.Context, pieceSize abi.UnpaddedPieceSize, pieceData storiface.Data) (abi.PieceInfo, error)
150150
}
151151

152152
type DealPublisher interface {

0 commit comments

Comments
 (0)