R4R: Slashing, validator set, and governance simulation

cmd/gaia/app/sim_test.go

@@ -125,7 +125,7 @@ func TestFullGaiaSimulation(t *testing.T) {
 		},
 		[]simulation.RandSetup{},
 		[]simulation.Invariant{
-			allInvariants,
+			simulation.PeriodicInvariant(allInvariants, 100, 0),
 		},
 		numKeys,
 		numBlocks,

x/mock/simulation/random_simulate_blocks.go

@@ -104,10 +104,7 @@ func SimulateFromSeed(
 		}
 
 		// Update the validator set
-		fmt.Printf("\nUpdates: %v\n", res.ValidatorUpdates)
-		fmt.Printf("Len before: %d\n", len(validators))
 		validators = UpdateValidators(t, validators, res.ValidatorUpdates)
-		fmt.Printf("Len after: %d\n", len(validators))
 	}
 
 	fmt.Printf("\nSimulation complete. Final height (blocks): %d, final time (seconds): %d\n", header.Height, header.Time)
@@ -162,10 +159,10 @@ func UpdateValidators(t *testing.T, current map[string]abci.Validator, updates [
 	for _, update := range updates {
 		switch {
 		case update.Power == 0:
-			require.NotNil(t, current[string(update.Address)], "tried to delete a nonexistent validator")
-			delete(current, string(update.Address))
+			require.NotNil(t, current[string(update.PubKey.Data)], "tried to delete a nonexistent validator")
+			delete(current, string(update.PubKey.Data))
 		default:
-			current[string(update.Address)] = update
+			current[string(update.PubKey.Data)] = update
 		}
 	}
 	return current

x/stake/handler.go

@@ -1,8 +1,6 @@
 package stake
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/stake/keeper"
 	"github.com/cosmos/cosmos-sdk/x/stake/tags"
@@ -12,7 +10,6 @@ import (
 
 func NewHandler(k keeper.Keeper) sdk.Handler {
 	return func(ctx sdk.Context, msg sdk.Msg) sdk.Result {
-		fmt.Printf("\nHandling msg %s\n", msg.GetSignBytes())
 		// NOTE msg already has validate basic run
 		switch msg := msg.(type) {
 		case types.MsgCreateValidator:

x/stake/keeper/validator.go

@@ -479,8 +479,6 @@ func kickOutValidators(k Keeper, ctx sdk.Context, toKickOut map[string]byte) {
 // perform all the store operations for when a validator status becomes unbonded
 func (k Keeper) unbondValidator(ctx sdk.Context, validator types.Validator) types.Validator {
 
-	fmt.Printf("\nUnbonding validator: %s\n", validator.Owner)
-
 	store := ctx.KVStore(k.storeKey)
 	pool := k.GetPool(ctx)
 
@@ -508,8 +506,6 @@ func (k Keeper) unbondValidator(ctx sdk.Context, validator types.Validator) type
 // perform all the store operations for when a validator status becomes bonded
 func (k Keeper) bondValidator(ctx sdk.Context, validator types.Validator) types.Validator {
 
-	fmt.Printf("\nBonding validator: %s\n", validator.Owner)
-
 	store := ctx.KVStore(k.storeKey)
 	pool := k.GetPool(ctx)