From fb5fe9914d2489f15450a0b9ccde9b5c06a26e16 Mon Sep 17 00:00:00 2001
From: Alessio Treglia <quadrispro@ubuntu.com>
Date: Fri, 24 Aug 2018 07:54:25 +0100
Subject: [PATCH] simplify json handling in LCD tests

---
 client/lcd/lcd_test.go | 37 ++++++++++++++++---------------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
index 67d8708832..298cf0027e 100644
--- a/client/lcd/lcd_test.go
+++ b/client/lcd/lcd_test.go
@@ -738,27 +738,22 @@ func doSendWithGas(t *testing.T, port, seed, name, password string, addr sdk.Acc
 		panic(err)
 	}
 
-	jsonStr := func() []byte {
-		if gas > 0 {
-			return []byte(fmt.Sprintf(`{
-				"name":"%s",
-				"password":"%s",
-				"account_number":"%d",
-				"sequence":"%d",
-				"amount":[%s],
-				"chain_id":"%s",
-				"gas":"%v"
-			}`, name, password, accnum, sequence, coinbz, chainID, gas))
-		}
-		return []byte(fmt.Sprintf(`{
-			"name":"%s",
-			"password":"%s",
-			"account_number":"%d",
-			"sequence":"%d",
-			"amount":[%s],
-			"chain_id":"%s"
-		}`, name, password, accnum, sequence, coinbz, chainID))
-	}()
+	gasStr := ""
+	if gas > 0 {
+		gasStr = fmt.Sprintf(`
+		"gas":"%v",
+		`, gas)
+	}
+	jsonStr := []byte(fmt.Sprintf(`{
+		%v
+		"name":"%s",
+		"password":"%s",
+		"account_number":"%d",
+		"sequence":"%d",
+		"amount":[%s],
+		"chain_id":"%s"
+	}`, gasStr, name, password, accnum, sequence, coinbz, chainID))
+
 	res, body = Request(t, port, "POST", fmt.Sprintf("/accounts/%s/send", receiveAddr), jsonStr)
 	return
 }