Set BatchPreCommitAboveBaseFee correctly

filecoin-project · Oct 1, 2021 · a2aed6c · a2aed6c
1 parent 1202337
commit a2aed6c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/extern/storage-sealing/commit_batch_test.go b/extern/storage-sealing/commit_batch_test.go
@@ -59,7 +59,8 @@ func TestCommitBatcher(t *testing.T) {
 			CommitBatchWait:  24 * time.Hour,
 			CommitBatchSlack: 1 * time.Hour,
 
-			AggregateAboveBaseFee: types.BigMul(types.PicoFil, types.NewInt(150)), // 0.15 nFIL
+			AggregateAboveBaseFee:      types.BigMul(types.PicoFil, types.NewInt(150)), // 0.15 nFIL
+			BatchPreCommitAboveBaseFee: types.BigMul(types.PicoFil, types.NewInt(150)), // 0.15 nFIL
 
 			TerminateBatchMin:  1,
 			TerminateBatchMax:  100,

diff --git a/itests/sector_miner_collateral_test.go b/itests/sector_miner_collateral_test.go
@@ -53,6 +53,7 @@ func TestMinerBalanceCollateral(t *testing.T) {
 						AvailableBalanceBuffer:     big.Zero(),
 						DisableCollateralFallback:  false,
 						AggregateAboveBaseFee:      big.Zero(),
+						BatchPreCommitAboveBaseFee: big.Zero(),
 					}, nil
 				}, nil
 			})),

diff --git a/node/modules/storageminer.go b/node/modules/storageminer.go
@@ -883,12 +883,13 @@ func NewSetSealConfigFunc(r repo.LockedRepo) (dtypes.SetSealingConfigFunc, error
 				PreCommitBatchWait:  config.Duration(cfg.PreCommitBatchWait),
 				PreCommitBatchSlack: config.Duration(cfg.PreCommitBatchSlack),
 
-				AggregateCommits:      cfg.AggregateCommits,
-				MinCommitBatch:        cfg.MinCommitBatch,
-				MaxCommitBatch:        cfg.MaxCommitBatch,
-				CommitBatchWait:       config.Duration(cfg.CommitBatchWait),
-				CommitBatchSlack:      config.Duration(cfg.CommitBatchSlack),
-				AggregateAboveBaseFee: types.FIL(cfg.AggregateAboveBaseFee),
+				AggregateCommits:           cfg.AggregateCommits,
+				MinCommitBatch:             cfg.MinCommitBatch,
+				MaxCommitBatch:             cfg.MaxCommitBatch,
+				CommitBatchWait:            config.Duration(cfg.CommitBatchWait),
+				CommitBatchSlack:           config.Duration(cfg.CommitBatchSlack),
+				AggregateAboveBaseFee:      types.FIL(cfg.AggregateAboveBaseFee),
+				BatchPreCommitAboveBaseFee: types.FIL(cfg.BatchPreCommitAboveBaseFee),
 
 				TerminateBatchMax:  cfg.TerminateBatchMax,
 				TerminateBatchMin:  cfg.TerminateBatchMin,