chore(deps): incorporate upstream concurrency fix (#302)

filecoin-project · Aug 8, 2024 · b46a700 · b46a700
1 parent de9214e
commit b46a700
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 131 deletions.
diff --git a/builtin/v9/migration/miner.go b/builtin/v9/migration/miner.go
@@ -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"
@@ -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)
 			}

diff --git a/builtin/v9/migration/test/miner_test.go b/builtin/v9/migration/test/miner_test.go
@@ -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"
@@ -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)
@@ -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)

diff --git a/go.mod b/go.mod
@@ -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
@@ -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
@@ -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
 )