From eb16a01666e79f38c73c3fdde3d16370539aa0b9 Mon Sep 17 00:00:00 2001
From: rigelrozanski <rigel.rozanski@gmail.com>
Date: Thu, 8 Nov 2018 00:22:16 -0500
Subject: [PATCH] util cleanup

---
 x/mock/simulation/mock_tendermint.go |  2 +
 x/mock/simulation/util.go            | 87 +++++++++++++++-------------
 2 files changed, 49 insertions(+), 40 deletions(-)

diff --git a/x/mock/simulation/mock_tendermint.go b/x/mock/simulation/mock_tendermint.go
index ee381cbb61..a98e896141 100644
--- a/x/mock/simulation/mock_tendermint.go
+++ b/x/mock/simulation/mock_tendermint.go
@@ -74,6 +74,7 @@ func updateValidators(tb testing.TB, r *rand.Rand, params Params,
 
 	for _, update := range updates {
 		str := fmt.Sprintf("%v", update.PubKey)
+
 		if update.Power == 0 {
 			if _, ok := current[str]; !ok {
 				tb.Fatalf("tried to delete a nonexistent validator")
@@ -85,6 +86,7 @@ func updateValidators(tb testing.TB, r *rand.Rand, params Params,
 			// validator already exists
 			mVal.val = update
 			event("endblock/validatorupdates/updated")
+
 		} else {
 			// Set this new validator
 			current[str] = mockValidator{
diff --git a/x/mock/simulation/util.go b/x/mock/simulation/util.go
index e115cde249..6b2c01052d 100644
--- a/x/mock/simulation/util.go
+++ b/x/mock/simulation/util.go
@@ -34,54 +34,61 @@ func DisplayEvents(events map[string]uint) {
 }
 
 // Builds a function to add logs for this particular block
-func addLogMessage(testingmode bool, blockLogBuilders []*strings.Builder, height int) func(string) {
-	if testingmode {
-		blockLogBuilders[height] = &strings.Builder{}
-		return func(x string) {
-			(*blockLogBuilders[height]).WriteString(x)
-			(*blockLogBuilders[height]).WriteString("\n")
-		}
+func addLogMessage(testingmode bool,
+	blockLogBuilders []*strings.Builder, height int) func(string) {
+
+	if !testingmode {
+		return func(_ string) {}
+	}
+
+	blockLogBuilders[height] = &strings.Builder{}
+	return func(x string) {
+		(*blockLogBuilders[height]).WriteString(x)
+		(*blockLogBuilders[height]).WriteString("\n")
 	}
-	return func(x string) {}
 }
 
 // Creates a function to print out the logs
 func logPrinter(testingmode bool, logs []*strings.Builder) func() {
-	if testingmode {
-		return func() {
-			numLoggers := 0
-			for i := 0; i < len(logs); i++ {
-				// We're passed the last created block
-				if logs[i] == nil {
-					numLoggers = i
-					break
-				}
-			}
-			var f *os.File
-			if numLoggers > 10 {
+	if !testingmode {
+		return func() {}
+	}
 
-				fileName := fmt.Sprintf("simulation_log_%s.txt",
-					time.Now().Format("2006-01-02 15:04:05"))
-
-				fmt.Printf("Too many logs to display, instead writing to %s\n", fileName)
-				f, _ = os.Create(fileName)
+	return func() {
+		numLoggers := 0
+		for i := 0; i < len(logs); i++ {
+			// We're passed the last created block
+			if logs[i] == nil {
+				numLoggers = i
+				break
 			}
-			for i := 0; i < numLoggers; i++ {
-				if f != nil {
-					_, err := f.WriteString(fmt.Sprintf("Begin block %d\n", i+1))
-					if err != nil {
-						panic("Failed to write logs to file")
-					}
-					_, err = f.WriteString((*logs[i]).String())
-					if err != nil {
-						panic("Failed to write logs to file")
-					}
-				} else {
-					fmt.Printf("Begin block %d\n", i+1)
-					fmt.Println((*logs[i]).String())
-				}
+		}
+
+		var f *os.File
+		if numLoggers > 10 {
+			fileName := fmt.Sprintf("simulation_log_%s.txt",
+				time.Now().Format("2006-01-02 15:04:05"))
+			fmt.Printf("Too many logs to display, instead writing to %s\n",
+				fileName)
+			f, _ = os.Create(fileName)
+		}
+
+		for i := 0; i < numLoggers; i++ {
+			if f == nil {
+				fmt.Printf("Begin block %d\n", i+1)
+				fmt.Println((*logs[i]).String())
+				continue
+			}
+
+			_, err := f.WriteString(fmt.Sprintf("Begin block %d\n", i+1))
+			if err != nil {
+				panic("Failed to write logs to file")
+			}
+
+			_, err = f.WriteString((*logs[i]).String())
+			if err != nil {
+				panic("Failed to write logs to file")
 			}
 		}
 	}
-	return func() {}
 }