test cover fix

cosmos · Nov 22, 2018 · fffc100 · fffc100
1 parent d41eeb1
commit fffc100
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/types/decimal.go b/types/decimal.go
@@ -172,6 +172,15 @@ func NewDecFromStr(str string) (d Dec, err Error) {
 	return Dec{combined}, nil
 }
 
+// Decimal from string, panic on error
+func MustNewDecFromStr(s string) Dec {
+	dec, err := NewDecFromStr(s)
+	if err != nil {
+		panic(err)
+	}
+	return dec
+}
+
 //______________________________________________________________________________________________
 //nolint
 func (d Dec) IsNil() bool       { return d.Int == nil }                 // is decimal nil

diff --git a/x/distribution/types/dec_coin.go b/x/distribution/types/dec_coin.go
@@ -140,7 +140,7 @@ func (coins DecCoins) MulDec(d sdk.Dec) DecCoins {
 	return res
 }
 
-// divide all the coins by a multiple
+// divide all the coins by a decimal
 func (coins DecCoins) QuoDec(d sdk.Dec) DecCoins {
 	res := make([]DecCoin, len(coins))
 	for i, coin := range coins {

diff --git a/x/distribution/types/delegator_info.go b/x/distribution/types/delegator_info.go
@@ -59,6 +59,11 @@ func (di DelegationDistInfo) WithdrawRewards(wc WithdrawContext, vi ValidatorDis
 	di.DelPoolWithdrawalHeight = wc.Height
 	withdrawalTokens := vi.DelPool.MulDec(accum.Quo(vi.DelAccum.Accum))
 
+	fmt.Printf("debug vi.DelPool: %v\n", vi.DelPool)
+	fmt.Printf("debug withdrawalTokens: %v\n", withdrawalTokens)
+	fmt.Printf("debug vi.DelAccum.Accum: %v\n", vi.DelAccum.Accum)
+	fmt.Printf("debug accum: %v\n", accum)
+
 	// defensive check for impossible accum ratios
 	if accum.GT(vi.DelAccum.Accum) {
 		panic(fmt.Sprintf("accum > vi.DelAccum.Accum:\n"+

diff --git a/x/distribution/types/delegator_info_test.go b/x/distribution/types/delegator_info_test.go
@@ -54,7 +54,8 @@ func TestWithdrawRewards(t *testing.T) {
 	assert.Equal(t, height, di2.DelPoolWithdrawalHeight)
 	assert.True(sdk.DecEq(t, sdk.NewDec(1800), fp.TotalValAccum.Accum))
 	assert.True(sdk.DecEq(t, sdk.NewDec(1800), fp.ValPool[0].Amount))
-	assert.True(sdk.DecEq(t, sdk.NewDec(49), vi.DelPool[0].Amount))
+	// NOTE minor rounding error
+	assert.True(sdk.DecEq(t, sdk.MustNewDecFromStr("48.9999999951"), vi.DelPool[0].Amount))
 	assert.True(sdk.DecEq(t, sdk.NewDec(4), vi.ValCommission[0].Amount))
-	assert.True(sdk.DecEq(t, sdk.NewDec(98), rewardRecv2[0].Amount))
+	assert.True(sdk.DecEq(t, sdk.MustNewDecFromStr("98.0000000049"), rewardRecv2[0].Amount))
 }