From f004d036dc31d469a731a3e92dbb619094d26394 Mon Sep 17 00:00:00 2001 From: Aayush Rajasekaran Date: Thu, 30 Sep 2021 21:23:39 -0400 Subject: [PATCH] Set BatchPreCommitAboveBaseFee correctly --- extern/storage-sealing/commit_batch_test.go | 3 ++- itests/sector_miner_collateral_test.go | 1 + node/modules/storageminer.go | 13 +++++++------ 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/extern/storage-sealing/commit_batch_test.go b/extern/storage-sealing/commit_batch_test.go index aea6d455e..e03c34693 100644 --- 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 index 891356ef1..de3da21f6 100644 --- 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 index 710d1f38f..5e6113072 100644 --- 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,