Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

incorporate upstream concurrency fix #302

Merged
merged 1 commit into from
Aug 8, 2024
Merged

incorporate upstream concurrency fix #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions builtin/v9/migration/miner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/filecoin-project/go-amt-ipld/v4"
"golang.org/x/xerrors"

commp "github.com/filecoin-project/go-commp-utils/nonffi"
commp "github.com/filecoin-project/go-commp-utils/v2"
"github.com/filecoin-project/go-state-types/builtin"
"github.com/filecoin-project/go-state-types/builtin/v8/market"
miner8 "github.com/filecoin-project/go-state-types/builtin/v8/miner"
Expand Down Expand Up @@ -214,7 +214,7 @@ func (m minerMigrator) migratePrecommits(ctx context.Context, wrappedStore adt8.
}

if len(pieces) != 0 {
commd, err := commp.GenerateUnsealedCID(info.Info.SealProof, pieces)
commd, _, err := commp.PieceAggregateCommP(info.Info.SealProof, pieces)
if err != nil {
return xerrors.Errorf("failed to generate unsealed CID: %w", err)
}
Expand Down
6 changes: 3 additions & 3 deletions builtin/v9/migration/test/miner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/filecoin-project/go-state-types/test_util"

commp "github.com/filecoin-project/go-commp-utils/nonffi"
commp "github.com/filecoin-project/go-commp-utils/v2"
market8 "github.com/filecoin-project/go-state-types/builtin/v8/market"

"github.com/filecoin-project/go-address"
Expand Down Expand Up @@ -289,7 +289,7 @@ func TestMinerMigration(t *testing.T) {
require.NoError(t, err)
require.True(t, ok)
require.NotNil(t, pc.Info.UnsealedCid)
expectedCid, err := commp.GenerateUnsealedCID(abi.RegisteredSealProof_StackedDrg32GiBV1_1, []abi.PieceInfo{{PieceCID: deal0.PieceCID, Size: deal0.PieceSize}})
expectedCid, _, err := commp.PieceAggregateCommP(abi.RegisteredSealProof_StackedDrg32GiBV1_1, []abi.PieceInfo{{PieceCID: deal0.PieceCID, Size: deal0.PieceSize}})
require.NoError(t, err)

require.Equal(t, expectedCid, *pc.Info.UnsealedCid)
Expand All @@ -298,7 +298,7 @@ func TestMinerMigration(t *testing.T) {
require.NoError(t, err)
require.True(t, ok)
require.NotNil(t, pc.Info.UnsealedCid)
expectedCid, err = commp.GenerateUnsealedCID(abi.RegisteredSealProof_StackedDrg32GiBV1_1, []abi.PieceInfo{
expectedCid, _, err = commp.PieceAggregateCommP(abi.RegisteredSealProof_StackedDrg32GiBV1_1, []abi.PieceInfo{
{PieceCID: deal1.PieceCID, Size: deal1.PieceSize},
{PieceCID: deal2.PieceCID, Size: deal2.PieceSize}})
require.NoError(t, err)
Expand Down
8 changes: 5 additions & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ require (
github.com/filecoin-project/go-address v1.1.0
github.com/filecoin-project/go-amt-ipld/v4 v4.4.0
github.com/filecoin-project/go-bitfield v0.2.4
github.com/filecoin-project/go-commp-utils/nonffi v0.0.0-20220905160352-62059082a837
github.com/filecoin-project/go-commp-utils/v2 v2.1.0
github.com/filecoin-project/go-hamt-ipld/v3 v3.4.0
github.com/ipfs/go-block-format v0.2.0
github.com/ipfs/go-cid v0.4.1
Expand All @@ -28,8 +28,9 @@ require (

require (
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/filecoin-project/go-commp-utils v0.1.3 // indirect
github.com/filecoin-project/go-fil-commcid v0.1.0 // indirect
github.com/filecoin-project/go-fil-commp-hashhash v0.2.0 // indirect
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
github.com/ipfs/go-ipfs-util v0.0.3 // indirect
github.com/ipfs/go-ipld-format v0.6.0 // indirect
github.com/klauspost/cpuid/v2 v2.2.8 // indirect
Expand All @@ -39,7 +40,8 @@ require (
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/polydawn/refmt v0.89.0 // indirect
github.com/spaolacci/murmur3 v1.1.0 // indirect
golang.org/x/sys v0.22.0 // indirect
golang.org/x/sys v0.23.0 // indirect
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
lukechampine.com/blake3 v1.3.0 // indirect
)
Loading
Loading