Merge develop

cosmos · Feb 5, 2019 · c49d580 · c49d580
1 parent 993b19e
commit c49d580
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/client/lcd/lcd_test.go b/client/lcd/lcd_test.go
@@ -943,14 +943,12 @@ func TestDistributionFlow(t *testing.T) {
 	// Delegate some coins
 	resultTx := doDelegate(t, port, name1, pw, addr, valAddr, 60, fees)
 	tests.WaitForHeight(resultTx.Height+1, port)
-	require.Equal(t, uint32(0), resultTx.CheckTx.Code)
-	require.Equal(t, uint32(0), resultTx.DeliverTx.Code)
+	require.Equal(t, uint32(0), resultTx.Code)
 
 	// send some coins
 	_, resultTx = doTransfer(t, port, seed, name1, memo, pw, addr, fees)
 	tests.WaitForHeight(resultTx.Height+5, port)
-	require.Equal(t, uint32(0), resultTx.CheckTx.Code)
-	require.Equal(t, uint32(0), resultTx.DeliverTx.Code)
+	require.Equal(t, uint32(0), resultTx.Code)
 
 	// Query outstanding rewards changed
 	oustandingRewards := mustParseDecCoins("9.80stake")
@@ -1000,6 +998,5 @@ func TestDistributionFlow(t *testing.T) {
 
 	// Withdraw delegator's rewards
 	resultTx = doWithdrawDelegatorAllRewards(t, port, seed, name1, pw, addr, fees)
-	require.Equal(t, uint32(0), resultTx.CheckTx.Code)
-	require.Equal(t, uint32(0), resultTx.DeliverTx.Code)
+	require.Equal(t, uint32(0), resultTx.Code)
 }
diff --git a/client/lcd/test_helpers.go b/client/lcd/test_helpers.go
@@ -1395,7 +1395,7 @@ type unjailReq struct {
 
 // POST /distribution/delegators/{delgatorAddr}/rewards Withdraw delegator rewards
 func doWithdrawDelegatorAllRewards(t *testing.T, port, seed, name, password string,
-	delegatorAddr sdk.AccAddress, fees sdk.Coins) (resultTx ctypes.ResultBroadcastTxCommit) {
+	delegatorAddr sdk.AccAddress, fees sdk.Coins) (resultTx sdk.TxResponse) {
 	// get the account to get the sequence
 	acc := getAccount(t, port, delegatorAddr)
 	accnum := acc.GetAccountNumber()
@@ -1411,7 +1411,7 @@ func doWithdrawDelegatorAllRewards(t *testing.T, port, seed, name, password stri
 	res, body := Request(t, port, "POST", fmt.Sprintf("/distribution/delegators/%s/rewards", delegatorAddr), req)
 	require.Equal(t, http.StatusOK, res.StatusCode, body)
 
-	var results ctypes.ResultBroadcastTxCommit
+	var results sdk.TxResponse
 	cdc.MustUnmarshalJSON([]byte(body), &results)
 
 	return results