debug cleanup
This commit is contained in:
parent
471ddeef3c
commit
a3447cd480
|
@ -43,10 +43,10 @@ func (ta TotalAccum) UpdateForNewHeight_DEBUG(height int64, accumCreatedPerBlock
|
|||
fmt.Println(
|
||||
cmn.Blue(
|
||||
fmt.Sprintf("FP Add %v * %v = %v, + %v (old) => %v (new)",
|
||||
accumCreatedPerBlock, sdk.NewInt(blocks),
|
||||
accumCreatedPerBlock.MulInt(sdk.NewInt(blocks)),
|
||||
ta.Accum,
|
||||
ta.Accum.Add(accumCreatedPerBlock.MulInt(sdk.NewInt(blocks))),
|
||||
accumCreatedPerBlock.String(), sdk.NewInt(blocks),
|
||||
accumCreatedPerBlock.MulInt(sdk.NewInt(blocks)).String(),
|
||||
ta.Accum.String(),
|
||||
ta.Accum.Add(accumCreatedPerBlock.MulInt(sdk.NewInt(blocks))).String(),
|
||||
),
|
||||
),
|
||||
)
|
||||
|
|
|
@ -56,6 +56,20 @@ func (vi ValidatorDistInfo) TakeFeePoolRewards(fp FeePool, height int64, totalBo
|
|||
blocks := height - vi.FeePoolWithdrawalHeight
|
||||
vi.FeePoolWithdrawalHeight = height
|
||||
accum := vdTokens.MulInt(sdk.NewInt(blocks))
|
||||
|
||||
if !accum.IsZero() {
|
||||
fmt.Println(
|
||||
cmn.Red(
|
||||
fmt.Sprintf("FP Sub %v * %v = %v, %v - _ => %v",
|
||||
vdTokens.String(), sdk.NewInt(blocks),
|
||||
accum.String(),
|
||||
fp.TotalValAccum.Accum.String(),
|
||||
fp.TotalValAccum.Accum.Sub(accum).String(),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
if accum.GT(fp.TotalValAccum.Accum) {
|
||||
panic("individual accum should never be greater than the total")
|
||||
}
|
||||
|
@ -65,19 +79,6 @@ func (vi ValidatorDistInfo) TakeFeePoolRewards(fp FeePool, height int64, totalBo
|
|||
commission := withdrawalTokens.MulDec(commissionRate)
|
||||
afterCommission := withdrawalTokens.Minus(commission)
|
||||
|
||||
if !accum.IsZero() {
|
||||
fmt.Println(
|
||||
cmn.Red(
|
||||
fmt.Sprintf("FP Sub %v * %v = %v, %v - _ => %v",
|
||||
vdTokens, sdk.NewInt(blocks),
|
||||
accum,
|
||||
fp.TotalValAccum.Accum,
|
||||
fp.TotalValAccum.Accum.Sub(accum),
|
||||
),
|
||||
),
|
||||
)
|
||||
}
|
||||
|
||||
fp.TotalValAccum.Accum = fp.TotalValAccum.Accum.Sub(accum)
|
||||
fp.Pool = remainingTokens
|
||||
vi.PoolCommission = vi.PoolCommission.Plus(commission)
|
||||
|
|
Loading…
Reference in New Issue