From 52316d9ef61e551871e271d22a91e50cdad3f9e8 Mon Sep 17 00:00:00 2001
From: rigelrozanski <rigel.rozanski@gmail.com>
Date: Tue, 9 Oct 2018 21:43:23 -0400
Subject: [PATCH] fix initialization of the test

---
 x/distribution/keeper/delegation_test.go      |  7 ++--
 x/distribution/keeper/test_common.go          | 39 +++++++++++--------
 .../types/{test_utils.go => test_common.go}   |  6 +--
 3 files changed, 30 insertions(+), 22 deletions(-)
 rename x/distribution/types/{test_utils.go => test_common.go} (82%)

diff --git a/x/distribution/keeper/delegation_test.go b/x/distribution/keeper/delegation_test.go
index 863cb6ccf3..59c4259f39 100644
--- a/x/distribution/keeper/delegation_test.go
+++ b/x/distribution/keeper/delegation_test.go
@@ -22,9 +22,10 @@ func TestWithdrawDelegationReward(t *testing.T) {
 	got = stakeHandler(ctx, msgDelegate)
 	require.True(t, got.IsOK())
 
-	amt1 := accMapper.GetAccount(ctx, delAddr1).GetCoins().AmountOf(denom)
-	require.Equal(t, 90, amt1.Int64())
-	keeper.WithdrawDelegationReward(ctx, delAddr1, valAddr1)
+	amt := accMapper.GetAccount(ctx, delAddr1).GetCoins().AmountOf(denom)
+	require.Equal(t, int64(90), amt.Int64())
+	_ = keeper
+	//keeper.WithdrawDelegationReward(ctx, delAddr1, valAddr1)
 }
 
 func TestWithdrawDelegationRewardsAll(t *testing.T) {
diff --git a/x/distribution/keeper/test_common.go b/x/distribution/keeper/test_common.go
index a984794421..37c1b0d4bb 100644
--- a/x/distribution/keeper/test_common.go
+++ b/x/distribution/keeper/test_common.go
@@ -23,24 +23,31 @@ import (
 )
 
 var (
-	delPk1       = ed25519.GenPrivKey().PubKey()
-	delPk2       = ed25519.GenPrivKey().PubKey()
-	delPk3       = ed25519.GenPrivKey().PubKey()
-	delAddr1     = sdk.AccAddress(delPk1.Address())
-	delAddr2     = sdk.AccAddress(delPk2.Address())
-	delAddr3     = sdk.AccAddress(delPk3.Address())
-	addrs        = []sdk.AccAddress{delAddr1, delAddr2, delAddr3}
+	delPk1   = ed25519.GenPrivKey().PubKey()
+	delPk2   = ed25519.GenPrivKey().PubKey()
+	delPk3   = ed25519.GenPrivKey().PubKey()
+	delAddr1 = sdk.AccAddress(delPk1.Address())
+	delAddr2 = sdk.AccAddress(delPk2.Address())
+	delAddr3 = sdk.AccAddress(delPk3.Address())
+
+	valPk1      = ed25519.GenPrivKey().PubKey()
+	valPk2      = ed25519.GenPrivKey().PubKey()
+	valPk3      = ed25519.GenPrivKey().PubKey()
+	valAddr1    = sdk.ValAddress(valPk1.Address())
+	valAddr2    = sdk.ValAddress(valPk2.Address())
+	valAddr3    = sdk.ValAddress(valPk3.Address())
+	valAccAddr1 = sdk.AccAddress(valPk1.Address()) // generate acc addresses for these validator keys too
+	valAccAddr2 = sdk.AccAddress(valPk2.Address())
+	valAccAddr3 = sdk.AccAddress(valPk3.Address())
+
+	addrs = []sdk.AccAddress{
+		delAddr1, delAddr2, delAddr3,
+		valAccAddr1, valAccAddr2, valAccAddr3,
+	}
+
 	emptyDelAddr sdk.AccAddress
-
-	valPk1       = ed25519.GenPrivKey().PubKey()
-	valPk2       = ed25519.GenPrivKey().PubKey()
-	valPk3       = ed25519.GenPrivKey().PubKey()
-	valAddr1     = sdk.ValAddress(delPk1.Address())
-	valAddr2     = sdk.ValAddress(delPk2.Address())
-	valAddr3     = sdk.ValAddress(delPk3.Address())
 	emptyValAddr sdk.ValAddress
-
-	emptyPubkey crypto.PubKey
+	emptyPubkey  crypto.PubKey
 )
 
 // create a codec used only for testing
diff --git a/x/distribution/types/test_utils.go b/x/distribution/types/test_common.go
similarity index 82%
rename from x/distribution/types/test_utils.go
rename to x/distribution/types/test_common.go
index 3ea78cd792..b77efd46c5 100644
--- a/x/distribution/types/test_utils.go
+++ b/x/distribution/types/test_common.go
@@ -18,9 +18,9 @@ var (
 	valPk1       = ed25519.GenPrivKey().PubKey()
 	valPk2       = ed25519.GenPrivKey().PubKey()
 	valPk3       = ed25519.GenPrivKey().PubKey()
-	valAddr1     = sdk.ValAddress(delPk1.Address())
-	valAddr2     = sdk.ValAddress(delPk2.Address())
-	valAddr3     = sdk.ValAddress(delPk3.Address())
+	valAddr1     = sdk.ValAddress(valPk1.Address())
+	valAddr2     = sdk.ValAddress(valPk2.Address())
+	valAddr3     = sdk.ValAddress(valPk3.Address())
 	emptyValAddr sdk.ValAddress
 
 	emptyPubkey crypto.PubKey