Remove methods from FilterEstimate so struct can be aliased from prio…

…r versions (#1564)
filecoin-project · Jan 13, 2022 · 9f1bed0 · 9f1bed0
1 parent a193179
commit 9f1bed0
Show file tree

Hide file tree

Showing 13 changed files with 70 additions and 534 deletions.
diff --git a/actors/builtin/cbor_gen.go b/actors/builtin/cbor_gen.go
diff --git a/actors/builtin/miner/miner_actor.go b/actors/builtin/miner/miner_actor.go
@@ -1917,7 +1917,7 @@ func (a Actor) ReportConsensusFault(rt Runtime, params *ReportConsensusFaultPara
 	rewardStats := requestCurrentEpochBlockReward(rt)
 	// The policy amounts we should burn and send to reporter
 	// These may differ from actual funds send when miner goes into fee debt
-	thisEpochReward := rewardStats.ThisEpochRewardSmoothed.Estimate()
+	thisEpochReward := smoothing.Estimate(&rewardStats.ThisEpochRewardSmoothed)
 	faultPenalty := ConsensusFaultPenalty(thisEpochReward)
 	slasherReward := RewardForConsensusSlashReport(thisEpochReward)
 	pledgeDelta := big.Zero()

diff --git a/actors/builtin/miner/miner_test.go b/actors/builtin/miner/miner_test.go
@@ -4743,7 +4743,7 @@ func (h *actorHarness) reportConsensusFault(rt *mock.Runtime, from addr.Address,
 	}
 	rt.ExpectSend(builtin.RewardActorAddr, builtin.MethodsReward.ThisEpochReward, nil, big.Zero(), &currentReward, exitcode.Ok)
 
-	thisEpochReward := h.epochRewardSmooth.Estimate()
+	thisEpochReward := smoothing.Estimate(&h.epochRewardSmooth)
 	penaltyTotal := miner.ConsensusFaultPenalty(thisEpochReward)
 	rewardTotal := miner.RewardForConsensusSlashReport(thisEpochReward)
 	rt.ExpectSend(from, builtin.MethodSend, nil, rewardTotal, nil, exitcode.Ok)

diff --git a/actors/builtin/miner/monies.go b/actors/builtin/miner/monies.go
@@ -74,9 +74,9 @@ var BasePenaltyForDisputedWindowPoSt = big.Mul(big.NewInt(20), builtin.TokenPrec
 // ProjectedRewardFraction(t) is the sum of estimated reward over estimated total power
 // over all epochs in the projection period [t t+projectionDuration]
 func ExpectedRewardForPower(rewardEstimate, networkQAPowerEstimate smoothing.FilterEstimate, qaSectorPower abi.StoragePower, projectionDuration abi.ChainEpoch) abi.TokenAmount {
-	networkQAPowerSmoothed := networkQAPowerEstimate.Estimate()
+	networkQAPowerSmoothed := smoothing.Estimate(&networkQAPowerEstimate)
 	if networkQAPowerSmoothed.IsZero() {
-		return rewardEstimate.Estimate()
+		return smoothing.Estimate(&rewardEstimate)
 	}
 	expectedRewardForProvingPeriod := smoothing.ExtrapolatedCumSumOfRatio(projectionDuration, 0, rewardEstimate, networkQAPowerEstimate)
 	br128 := big.Mul(qaSectorPower, expectedRewardForProvingPeriod) // Q.0 * Q.128 => Q.128
@@ -170,7 +170,7 @@ func InitialPledgeForPower(qaPower, baselinePower abi.StoragePower, rewardEstima
 	lockTargetNum := big.Mul(InitialPledgeLockTarget.Numerator, circulatingSupply)
 	lockTargetDenom := InitialPledgeLockTarget.Denominator
 	pledgeShareNum := qaPower
-	networkQAPower := networkQAPowerEstimate.Estimate()
+	networkQAPower := smoothing.Estimate(&networkQAPowerEstimate)
 	pledgeShareDenom := big.Max(big.Max(networkQAPower, baselinePower), qaPower) // use qaPower in case others are 0
 	additionalIPNum := big.Mul(lockTargetNum, pledgeShareNum)
 	additionalIPDenom := big.Mul(lockTargetDenom, pledgeShareDenom)

diff --git a/actors/builtin/power/cbor_gen.go b/actors/builtin/power/cbor_gen.go