From a3447cd4804d78a781b06c23360ded576fec866f Mon Sep 17 00:00:00 2001
From: rigelrozanski <rigel.rozanski@gmail.com>
Date: Mon, 22 Oct 2018 15:51:27 -0400
Subject: [PATCH] debug cleanup

---
 x/distribution/types/fee_pool.go       |  8 ++++----
 x/distribution/types/validator_info.go | 27 +++++++++++++-------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/x/distribution/types/fee_pool.go b/x/distribution/types/fee_pool.go
index 1d045726a1..a792a888f2 100644
--- a/x/distribution/types/fee_pool.go
+++ b/x/distribution/types/fee_pool.go
@@ -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(),
 				),
 			),
 		)
diff --git a/x/distribution/types/validator_info.go b/x/distribution/types/validator_info.go
index 01152219ec..df1062e5c4 100644
--- a/x/distribution/types/validator_info.go
+++ b/x/distribution/types/validator_info.go
@@ -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)