fix(lotus-sim): correctly merge forward commit queue.

2021-06-07 19:57:46 -07:00 · 2021-06-07 19:57:46 -07:00 · 82019ce474
commit 82019ce474
parent 2e4f526375
2 changed files with 3 additions and 1 deletions
--- a/cmd/lotus-sim/simulation/commit_queue.go
+++ b/cmd/lotus-sim/simulation/commit_queue.go
@ -129,6 +129,8 @@ func (q *commitQueue) advanceEpoch(epoch abi.ChainEpoch) {
 				currPending[ty] = append(currSnos, nextSnos...)
 			}
 		}
+		// Now replace next with the merged curr.
+		q.queue[0] = curr
 	}
 	q.offset = epoch
 	if len(q.queue) == 0 {
--- a/cmd/lotus-sim/simulation/provecommit.go
+++ b/cmd/lotus-sim/simulation/provecommit.go
@ -171,7 +171,7 @@ func (ss *simulationState) packProveCommitsMiner(
 							pending.finish(sealType, len(expired))

 							log.Errorw("failed to prove commit expired/missing pre-commits",
-								"error", err,
+								"error", aerr,
 								"miner", minerAddr,
 								"expired", expired,
 								"discarded", len(expired),