From 0572a2743e2de71b03bafc3df58a96ed0c953fdf Mon Sep 17 00:00:00 2001
From: Christopher Goes <cwgoes@pluranimity.org>
Date: Wed, 11 Jul 2018 19:17:09 +0200
Subject: [PATCH] Changes from merge

---
 x/stake/simulation_test.go | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/x/stake/simulation_test.go b/x/stake/simulation_test.go
index f9abc60640..b7fe42e382 100644
--- a/x/stake/simulation_test.go
+++ b/x/stake/simulation_test.go
@@ -109,10 +109,11 @@ func SimulateMsgCreateValidator(m auth.AccountMapper, k Keeper) mock.TestAndRunM
 			return "nop", nil
 		}
 		msg := MsgCreateValidator{
-			Description:    description,
-			ValidatorAddr:  address,
-			PubKey:         pubkey,
-			SelfDelegation: sdk.NewIntCoin(denom, amount),
+			Description:   description,
+			ValidatorAddr: address,
+			DelegatorAddr: address,
+			PubKey:        pubkey,
+			Delegation:    sdk.NewIntCoin(denom, amount),
 		}
 		require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes())
 		ctx, write := ctx.CacheContext()
@@ -173,7 +174,7 @@ func SimulateMsgDelegate(m auth.AccountMapper, k Keeper) mock.TestAndRunMsg {
 		msg := MsgDelegate{
 			DelegatorAddr: delegatorAddress,
 			ValidatorAddr: validatorAddress,
-			Bond:          sdk.NewIntCoin(denom, amount),
+			Delegation:    sdk.NewIntCoin(denom, amount),
 		}
 		require.Nil(t, msg.ValidateBasic(), "expected msg to pass ValidateBasic: %s", msg.GetSignBytes())
 		ctx, write := ctx.CacheContext()