cerc-io/lotus
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

Make things build with both batchers

Browse Source
This commit is contained in:
Łukasz Magiera 2021-05-18 16:53:49 +02:00
parent c7ba083fa4
commit 81b5d8c671
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chain/gen/gen.go
View File

@ -693,7 +693,7 @@ func (m genFakeVerifier) VerifyAggregateSeals(aggregate proof5.AggregateSealVeri
panic("not supported") panic("not supported")
} }
func (m genFakeVerifier) AggregateSealProofs(proofType abi.RegisteredSealProof, rap abi.RegisteredAggregationProof, proofs [][]byte) ([]byte, error) { func (m genFakeVerifier) AggregateSealProofs(ai proof5.AggregateSealVerifyProofAndInfos, proofs [][]byte) ([]byte, error) {
panic("not supported") panic("not supported")
} }

24
node/modules/storageminer.go
View File

@ -824,14 +824,22 @@ func NewSetSealConfigFunc(r repo.LockedRepo) (dtypes.SetSealingConfigFunc, error
MaxSealingSectorsForDeals: cfg.MaxSealingSectorsForDeals, MaxSealingSectorsForDeals: cfg.MaxSealingSectorsForDeals,
WaitDealsDelay: config.Duration(cfg.WaitDealsDelay), WaitDealsDelay: config.Duration(cfg.WaitDealsDelay),
AlwaysKeepUnsealedCopy: cfg.AlwaysKeepUnsealedCopy, AlwaysKeepUnsealedCopy: cfg.AlwaysKeepUnsealedCopy,
AggregateCommits: cfg.AggregateCommits,
MinCommitBatch: cfg.MinCommitBatch, BatchPreCommits: cfg.BatchPreCommits,
MaxCommitBatch: cfg.MaxCommitBatch, MinPreCommitBatch: cfg.MinPreCommitBatch,
CommitBatchWait: cfg.CommitBatchWait, MaxPreCommitBatch: cfg.MaxPreCommitBatch,
CommitBatchSlack: cfg.CommitBatchSlack, PreCommitBatchWait: config.Duration(cfg.PreCommitBatchWait),
TerminateBatchMax: cfg.TerminateBatchMax, PreCommitBatchSlack: config.Duration(cfg.PreCommitBatchSlack),
TerminateBatchMin: cfg.TerminateBatchMin,
TerminateBatchWait: cfg.TerminateBatchWait, AggregateCommits: cfg.AggregateCommits,
MinCommitBatch: cfg.MinCommitBatch,
MaxCommitBatch: cfg.MaxCommitBatch,
CommitBatchWait: config.Duration(cfg.CommitBatchWait),
CommitBatchSlack: config.Duration(cfg.CommitBatchSlack),
TerminateBatchMax: cfg.TerminateBatchMax,
TerminateBatchMin: cfg.TerminateBatchMin,
TerminateBatchWait: config.Duration(cfg.TerminateBatchWait),
} }
}) })
return return