Fix build

filecoin-project · Mar 30, 2021 · 3fe1992 · 3fe1992
1 parent eb6939b
commit 3fe1992
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/chain/gen/gen.go b/chain/gen/gen.go
@@ -24,7 +24,7 @@ import (
 	"go.opencensus.io/trace"
 	"golang.org/x/xerrors"
 
-	proof3 "github.com/filecoin-project/specs-actors/v2/actors/runtime/proof"
+	proof3 "github.com/filecoin-project/specs-actors/v3/actors/runtime/proof"
 
 	"github.com/filecoin-project/lotus/api"
 	"github.com/filecoin-project/lotus/blockstore"

diff --git a/extern/filecoin-ffi b/extern/filecoin-ffi
diff --git a/extern/storage-sealing/sealing.go b/extern/storage-sealing/sealing.go
@@ -153,7 +153,7 @@ func New(api SealingAPI, fc FeeConfig, events Events, maddr address.Address, ds
 		addrSel: as,
 
 		terminator: NewTerminationBatcher(context.TODO(), maddr, api, as, fc),
-		commiter:   NewCommitBatcher(context.TODO(), maddr, api, as, fc),
+		commiter:   NewCommitBatcher(context.TODO(), maddr, api, as, fc, gc),
 
 		getConfig: gc,
 		dealInfo:  &CurrentDealInfoManager{api},

diff --git a/extern/storage-sealing/states_sealing.go b/extern/storage-sealing/states_sealing.go
@@ -528,7 +528,7 @@ func (m *Sealing) handleSubmitCommitAggregate(ctx statemachine.Context, sector S
 		return ctx.Send(SectorCommitFailed{xerrors.Errorf("sector had nil commR or commD")})
 	}
 
-	mcid, err := m.commiter.AddCommit(ctx.Context(), m.minerSectorID(sector.SectorNumber), AggregateInput{
+	mcid, err := m.commiter.AddCommit(ctx.Context(), sector.SectorNumber, AggregateInput{
 		info: proof.AggregateSealVerifyInfo{
 			SealProof:             sector.SectorType,
 			Number:                sector.SectorNumber,

diff --git a/node/config/def.go b/node/config/def.go
@@ -83,8 +83,8 @@ type SealingConfig struct {
 	AlwaysKeepUnsealedCopy bool
 
 	AggregateCommits bool
-	MinCommitBatch   uint64
-	MaxCommitBatch   uint64
+	MinCommitBatch   int
+	MaxCommitBatch   int
 
 	// Keep this many sectors in sealing pipeline, start CC if needed
 	// todo TargetSealingSectors uint64