From 446e50ca9ee8ed3fbea9e5418282acf8b5842dbf Mon Sep 17 00:00:00 2001
From: Ethan Frey <ethanfrey@users.noreply.github.com>
Date: Mon, 23 Oct 2017 14:20:15 +0200
Subject: [PATCH] Moved RandVal into test helper functions, as needed in other
 repos for testing

---
 example/dummy/dummy_test.go | 15 ++-------------
 example/dummy/helpers.go    | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 example/dummy/helpers.go

diff --git a/example/dummy/dummy_test.go b/example/dummy/dummy_test.go
index fbc095e6..751a2e91 100644
--- a/example/dummy/dummy_test.go
+++ b/example/dummy/dummy_test.go
@@ -10,7 +10,6 @@ import (
 	abcicli "github.com/tendermint/abci/client"
 	"github.com/tendermint/abci/server"
 	"github.com/tendermint/abci/types"
-	crypto "github.com/tendermint/go-crypto"
 	"github.com/tendermint/iavl"
 	cmn "github.com/tendermint/tmlibs/common"
 	"github.com/tendermint/tmlibs/log"
@@ -79,10 +78,9 @@ func TestPersistentDummyInfo(t *testing.T) {
 		t.Fatal(err)
 	}
 	dummy := NewPersistentDummyApplication(dir)
+	InitDummy(dummy)
 	height := uint64(0)
 
-	dummy.InitChain(types.RequestInitChain{[]*types.Validator{randVal(0)}})
-
 	resInfo := dummy.Info(types.RequestInfo{})
 	if resInfo.LastBlockHeight != height {
 		t.Fatalf("expected height of %d, got %d", height, resInfo.LastBlockHeight)
@@ -105,12 +103,6 @@ func TestPersistentDummyInfo(t *testing.T) {
 
 }
 
-func randVal(i int) *types.Validator {
-	pubkey := crypto.GenPrivKeyEd25519FromSecret([]byte(cmn.Fmt("test%d", i))).PubKey().Bytes()
-	power := cmn.RandInt()
-	return &types.Validator{pubkey, uint64(power)}
-}
-
 // add a validator, remove a validator, update a validator
 func TestValSetChanges(t *testing.T) {
 	dir, err := ioutil.TempDir("/tmp", "abci-dummy-test") // TODO
@@ -122,10 +114,7 @@ func TestValSetChanges(t *testing.T) {
 	// init with some validators
 	total := 10
 	nInit := 5
-	vals := make([]*types.Validator, total)
-	for i := 0; i < total; i++ {
-		vals[i] = randVal(i)
-	}
+	vals := RandVals(total)
 	// iniitalize with the first nInit
 	dummy.InitChain(types.RequestInitChain{vals[:nInit]})
 
diff --git a/example/dummy/helpers.go b/example/dummy/helpers.go
new file mode 100644
index 00000000..55c464de
--- /dev/null
+++ b/example/dummy/helpers.go
@@ -0,0 +1,34 @@
+package dummy
+
+import (
+	"github.com/tendermint/abci/types"
+	crypto "github.com/tendermint/go-crypto"
+	cmn "github.com/tendermint/tmlibs/common"
+)
+
+// RandVal creates one random validator, with a key derived
+// from the input value
+func RandVal(i int) *types.Validator {
+	pubkey := crypto.GenPrivKeyEd25519FromSecret([]byte(cmn.Fmt("test%d", i))).PubKey().Bytes()
+	power := cmn.RandUint16() + 1
+	return &types.Validator{pubkey, uint64(power)}
+}
+
+// RandVals returns a list of cnt validators for initializing
+// the application. Note that the keys are deterministically
+// derived from the index in the array, while the power is
+// random (Change this if not desired)
+func RandVals(cnt int) []*types.Validator {
+	res := make([]*types.Validator, cnt)
+	for i := 0; i < cnt; i++ {
+		res[i] = RandVal(i)
+	}
+	return res
+}
+
+// InitDummy initializes the dummy app with some data,
+// which allows tests to pass and is fine as long as you
+// don't make any tx that modify the validator state
+func InitDummy(app *PersistentDummyApplication) {
+	app.InitChain(types.RequestInitChain{RandVals(1)})
+}