Merge with develop

client/lcd/lcd_test.go

@@ -122,6 +122,11 @@ func TestKeys(t *testing.T) {
 }
 
 func TestVersion(t *testing.T) {
+	// skip the test if the VERSION environment variable has not been set
+	if version.Version == "" {
+		t.SkipNow()
+	}
+
 	cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
 	defer cleanup()
 
@@ -836,14 +841,16 @@ func doSendWithGas(t *testing.T, port, seed, name, password string, addr sdk.Acc
 		`, gasAdjustment)
 	}
 	jsonStr := []byte(fmt.Sprintf(`{
-		%v%v
-		"name":"%s",
-		"password":"%s",
-		"account_number":"%d",
-		"sequence":"%d",
 		"amount":[%s],
-		"chain_id":"%s"
-	}`, gasStr, gasAdjustmentStr, name, password, accnum, sequence, coinbz, chainID))
+		"base_req": {
+			%v%v
+			"name": "%s",
+			"password": "%s",
+			"chain_id": "%s",
+			"account_number":"%d",
+			"sequence":"%d"
+		}
+	}`, coinbz, gasStr, gasAdjustmentStr, name, password, chainID, accnum, sequence))
 
 	res, body = Request(t, port, "POST", fmt.Sprintf("/accounts/%s/send%v", receiveAddr, queryStr), jsonStr)
 	return
@@ -884,18 +891,20 @@ func doIBCTransfer(t *testing.T, port, seed, name, password string, addr sdk.Acc
 
 	// send
 	jsonStr := []byte(fmt.Sprintf(`{
-		"name":"%s",
-		"password": "%s",
-		"account_number":"%d",
-		"sequence": "%d",
-		"src_chain_id": "%s",
 		"amount":[
 			{
 				"denom": "%s",
 				"amount": "1"
 			}
-		]
-	}`, name, password, accnum, sequence, chainID, "steak"))
+		],
+		"base_req": {
+			"name": "%s",
+			"password": "%s",
+			"chain_id": "%s",
+			"account_number":"%d",
+			"sequence":"%d"
+		}
+	}`, "steak", name, password, chainID, accnum, sequence))
 
 	res, body := Request(t, port, "POST", fmt.Sprintf("/ibc/testchain/%s/send", receiveAddr), jsonStr)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
@@ -1004,11 +1013,6 @@ func doDelegate(t *testing.T, port, seed, name, password string,
 	chainID := viper.GetString(client.FlagChainID)
 
 	jsonStr := []byte(fmt.Sprintf(`{
-		"name": "%s",
-		"password": "%s",
-		"account_number": "%d",
-		"sequence": "%d",
-		"chain_id": "%s",
 		"delegations": [
 			{
 				"delegator_addr": "%s",
@@ -1019,8 +1023,15 @@ func doDelegate(t *testing.T, port, seed, name, password string,
 		"begin_unbondings": [],
 		"complete_unbondings": [],
 		"begin_redelegates": [],
-		"complete_redelegates": []
-	}`, name, password, accnum, sequence, chainID, delAddr, valAddr, "steak", amount))
+		"complete_redelegates": [],
+		"base_req": {
+			"name": "%s",
+			"password": "%s",
+			"chain_id": "%s",
+			"account_number":"%d",
+			"sequence":"%d"
+		}
+	}`, delAddr, valAddr, "steak", amount, name, password, chainID, accnum, sequence))
 
 	res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delAddr), jsonStr)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
@@ -1041,11 +1052,6 @@ func doBeginUnbonding(t *testing.T, port, seed, name, password string,
 	chainID := viper.GetString(client.FlagChainID)
 
 	jsonStr := []byte(fmt.Sprintf(`{
-		"name": "%s",
-		"password": "%s",
-		"account_number": "%d",
-		"sequence": "%d",
-		"chain_id": "%s",
 		"delegations": [],
 		"begin_unbondings": [
 			{
@@ -1056,8 +1062,15 @@ func doBeginUnbonding(t *testing.T, port, seed, name, password string,
 		],
 		"complete_unbondings": [],
 		"begin_redelegates": [],
-		"complete_redelegates": []
-	}`, name, password, accnum, sequence, chainID, delAddr, valAddr, amount))
+		"complete_redelegates": [],
+		"base_req": {
+			"name": "%s",
+			"password": "%s",
+			"chain_id": "%s",
+			"account_number":"%d",
+			"sequence":"%d"
+		}
+	}`, delAddr, valAddr, amount, name, password, chainID, accnum, sequence))
 
 	res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delAddr), jsonStr)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
@@ -1079,11 +1092,6 @@ func doBeginRedelegation(t *testing.T, port, seed, name, password string,
 	chainID := viper.GetString(client.FlagChainID)
 
 	jsonStr := []byte(fmt.Sprintf(`{
-		"name": "%s",
-		"password": "%s",
-		"account_number": "%d",
-		"sequence": "%d",
-		"chain_id": "%s",
 		"delegations": [],
 		"begin_unbondings": [],
 		"complete_unbondings": [],
@@ -1095,8 +1103,15 @@ func doBeginRedelegation(t *testing.T, port, seed, name, password string,
 				"shares": "30"
 			}
 		],
-		"complete_redelegates": []
-	}`, name, password, accnum, sequence, chainID, delAddr, valSrcAddr, valDstAddr))
+		"complete_redelegates": [],
+		"base_req": {
+			"name": "%s",
+			"password": "%s",
+			"chain_id": "%s",
+			"account_number":"%d",
+			"sequence":"%d"
+		}
+	}`, delAddr, valSrcAddr, valDstAddr, name, password, chainID, accnum, sequence))
 
 	res, body := Request(t, port, "POST", fmt.Sprintf("/stake/delegators/%s/delegations", delAddr), jsonStr)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)

client/lcd/root.go

@@ -122,6 +122,9 @@ func ServeCommand(cdc *codec.Codec) *cobra.Command {
 	cmd.Flags().String(client.FlagNode, "tcp://localhost:26657", "Address of the node to connect to")
 	cmd.Flags().Int(flagMaxOpenConnections, 1000, "The number of maximum open connections")
 	cmd.Flags().Bool(client.FlagTrustNode, false, "Trust connected full node (don't verify proofs for responses)")
+	viper.BindPFlag(client.FlagTrustNode, cmd.Flags().Lookup(client.FlagTrustNode))
+	viper.BindPFlag(client.FlagChainID, cmd.Flags().Lookup(client.FlagChainID))
+	viper.BindPFlag(client.FlagNode, cmd.Flags().Lookup(client.FlagNode))
 
 	return cmd
 }