demonstrate defensive accum height for zero-delegations

cosmos · Nov 22, 2018 · b466775 · b466775
1 parent ccfbfcf
commit b466775
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/x/distribution/types/delegator_info.go b/x/distribution/types/delegator_info.go
@@ -50,6 +50,7 @@ func (di DelegationDistInfo) WithdrawRewards(wc WithdrawContext, vi ValidatorDis
 	vi = vi.UpdateTotalDelAccum(wc.Height, totalDelShares)
 
 	if vi.DelAccum.Accum.IsZero() {
+		di.DelPoolWithdrawalHeight = wc.Height
 		return di, vi, fp, DecCoins{}
 	}
 

diff --git a/x/stake/keeper/delegation.go b/x/stake/keeper/delegation.go
@@ -600,9 +600,9 @@ func (k Keeper) BeginRedelegation(ctx sdk.Context, delAddr sdk.AccAddress,
 	}
 
 	rounded := returnAmount.TruncateInt()
-	if rounded.IsZero() { //TODO design consideration
-		return types.Redelegation{}, types.ErrVerySmallRedelegation(k.Codespace())
-	}
+	//if rounded.IsZero() { //TODO design consideration
+	//return types.Redelegation{}, types.ErrVerySmallRedelegation(k.Codespace())
+	//}
 	returnCoin := sdk.NewCoin(k.BondDenom(ctx), rounded)
 	change := returnAmount.Sub(sdk.NewDecFromInt(rounded))
 

diff --git a/x/stake/simulation/invariants.go b/x/stake/simulation/invariants.go
@@ -33,10 +33,10 @@ func AllInvariants(ck bank.Keeper, k stake.Keeper,
 			return err
 		}
 
-		err = PositiveDelegationInvariant(k)(app)
-		if err != nil {
-			return err
-		}
+		//err = PositiveDelegationInvariant(k)(app)
+		//if err != nil {
+		//return err
+		//}
 
 		err = DelegatorSharesInvariant(k)(app)
 		if err != nil {