Merge PR #1950: Validator.Owner -> .Operator

* Rename --address-validator flag to --validator

See #1901

* Update PENDING.md

* Rename Validator.Owner -> Validator.Operator

See #1901

PENDING.md

@@ -40,6 +40,9 @@ BREAKING CHANGES
 * [cli] #1551: Officially removed `--name` from CLI commands
 * [cli] Genesis/key creation (`init`) now supports user-provided key passwords
 * [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id
+* [cli] \#1901 Flag --address-validator renamed to --validator in stake and slashing commands
+* [types] \#1901 Validator interface's GetOwner() renamed to GetOperator()
+* [x/stake] \#1901 Validator type's Owner field renamed to Operator; Validator's GetOwner() renamed accordingly to comply with the SDK's Validator interface.
 
 FEATURES
 * [lcd] Can now query governance proposals by ProposalStatus

client/lcd/lcd_test.go

@@ -361,23 +361,23 @@ func TestValidatorsQuery(t *testing.T) {
 	validators := getValidators(t, port)
 	require.Equal(t, len(validators), 1)
 
-	// make sure all the validators were found (order unknown because sorted by owner addr)
+	// make sure all the validators were found (order unknown because sorted by operator addr)
 	foundVal := false
 	pkBech := sdk.MustBech32ifyValPub(pks[0])
 	if validators[0].PubKey == pkBech {
 		foundVal = true
 	}
-	require.True(t, foundVal, "pkBech %v, owner %v", pkBech, validators[0].Owner)
+	require.True(t, foundVal, "pkBech %v, operator %v", pkBech, validators[0].Operator)
 }
 
 func TestValidatorQuery(t *testing.T) {
 	cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
 	defer cleanup()
 	require.Equal(t, 1, len(pks))
 
-	validator1Owner := sdk.AccAddress(pks[0].Address())
-	validator := getValidator(t, port, validator1Owner)
-	assert.Equal(t, validator.Owner, validator1Owner, "The returned validator does not hold the correct data")
+	validator1Operator := sdk.AccAddress(pks[0].Address())
+	validator := getValidator(t, port, validator1Operator)
+	assert.Equal(t, validator.Operator, validator1Operator, "The returned validator does not hold the correct data")
 }
 
 func TestBonding(t *testing.T) {
@@ -386,10 +386,11 @@ func TestBonding(t *testing.T) {
 	cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
 	defer cleanup()
 
-	validator1Owner := sdk.AccAddress(pks[0].Address())
-	validator := getValidator(t, port, validator1Owner)
+	validator1Operator := sdk.AccAddress(pks[0].Address())
+	validator := getValidator(t, port, validator1Operator)
 
-	resultTx := doDelegate(t, port, seed, name, password, addr, validator1Owner, 60)
+	// create bond TX
+	resultTx := doDelegate(t, port, seed, name, password, addr, validator1Operator, 60)
 	tests.WaitForHeight(resultTx.Height+1, port)
 
 	require.Equal(t, uint32(0), resultTx.CheckTx.Code)
@@ -400,7 +401,8 @@ func TestBonding(t *testing.T) {
 
 	require.Equal(t, int64(40), coins.AmountOf(denom).Int64())
 
-	bond := getDelegation(t, port, addr, validator1Owner)
+	// query validator
+	bond := getDelegation(t, port, addr, validator1Operator)
 	require.Equal(t, "60.0000000000", bond.Shares)
 
 	summary := getDelegationSummary(t, port, addr)
@@ -411,16 +413,17 @@ func TestBonding(t *testing.T) {
 
 	bondedValidators := getDelegatorValidators(t, port, addr)
 	require.Len(t, bondedValidators, 1)
-	require.Equal(t, validator1Owner, bondedValidators[0].Owner)
+	require.Equal(t, validator1Operator, bondedValidators[0].Operator)
 	require.Equal(t, validator.DelegatorShares.Add(sdk.NewDec(60)).String(), bondedValidators[0].DelegatorShares.String())
 
-	bondedValidator := getDelegatorValidator(t, port, addr, validator1Owner)
-	require.Equal(t, validator1Owner, bondedValidator.Owner)
+	bondedValidator := getDelegatorValidator(t, port, addr, validator1Operator)
+	require.Equal(t, validator1Operator, bondedValidator.Operator)
 
 	//////////////////////
 	// testing unbonding
 
-	resultTx = doBeginUnbonding(t, port, seed, name, password, addr, validator1Owner, 60)
+	// create unbond TX
+	resultTx = doBeginUnbonding(t, port, seed, name, password, addr, validator1Operator, 60)
 	tests.WaitForHeight(resultTx.Height+1, port)
 
 	require.Equal(t, uint32(0), resultTx.CheckTx.Code)
@@ -431,7 +434,7 @@ func TestBonding(t *testing.T) {
 	coins = acc.GetCoins()
 	require.Equal(t, int64(40), coins.AmountOf("steak").Int64())
 
-	unbondings := getUndelegations(t, port, addr, validator1Owner)
+	unbondings := getUndelegations(t, port, addr, validator1Operator)
 	require.Len(t, unbondings, 1, "Unbondings holds all unbonding-delegations")
 	require.Equal(t, "60", unbondings[0].Balance.Amount.String())
 

cmd/gaia/app/genesis.go

@@ -202,8 +202,8 @@ func GaiaAppGenState(cdc *wire.Codec, appGenTxs []json.RawMessage) (genesisState
 
 			// create the self-delegation from the issuedDelShares
 			delegation := stake.Delegation{
-				DelegatorAddr: validator.Owner,
-				ValidatorAddr: validator.Owner,
+				DelegatorAddr: validator.Operator,
+				ValidatorAddr: validator.Operator,
 				Shares:        issuedDelShares,
 				Height:        0,
 			}

cmd/gaia/cli_test/cli_test.go

@@ -131,13 +131,13 @@ func TestGaiaCLICreateValidator(t *testing.T) {
 	require.Equal(t, int64(8), barAcc.GetCoins().AmountOf("steak").Int64(), "%v", barAcc)
 
 	validator := executeGetValidator(t, fmt.Sprintf("gaiacli stake validator %s --output=json %v", barAddr, flags))
-	require.Equal(t, validator.Owner, barAddr)
+	require.Equal(t, validator.Operator, barAddr)
 	require.True(sdk.DecEq(t, sdk.NewDec(2), validator.Tokens))
 
 	// unbond a single share
 	unbondStr := fmt.Sprintf("gaiacli stake unbond begin %v", flags)
 	unbondStr += fmt.Sprintf(" --from=%s", "bar")
-	unbondStr += fmt.Sprintf(" --address-validator=%s", barAddr)
+	unbondStr += fmt.Sprintf(" --validator=%s", barAddr)
 	unbondStr += fmt.Sprintf(" --shares-amount=%v", "1")
 
 	success := executeWrite(t, unbondStr, app.DefaultKeyPass)

docs/sdk/clients.md

@@ -120,9 +120,9 @@ On the testnet, we delegate `steak` instead of `atom`. Here's how you can bond t
 ```bash
 gaiacli stake delegate \
   --amount=10steak \
-  --address-validator=$(gaiad tendermint show-validator) \
+  --validator=$(gaiad tendermint show-validator) \
   --name=<key_name> \
-  --chain-id=gaia-7005
+  --chain-id=gaia-6002
 ```
 
 While tokens are bonded, they are pooled with all the other bonded tokens in the network. Validators and delegators obtain a percentage of shares that equal their stake in this pool.
@@ -137,9 +137,9 @@ If for any reason the validator misbehaves, or you want to unbond a certain amou
 
 ```bash
 gaiacli stake unbond begin \
-  --address-validator=$(gaiad tendermint show-validator) \
+  --validator=$(gaiad tendermint show-validator) \
   --shares=MAX \
-  --name=<key_name> \
+  --from=<key_name> \
   --chain-id=gaia-7005
 ```
 
@@ -152,7 +152,7 @@ gaiacli account <account_cosmosaccaddr>
 
 gaiacli stake delegation \
   --address-delegator=<account_cosmosaccaddr> \
-  --address-validator=$(gaiad tendermint show-validator) \
+  --validator=$(gaiad tendermint show-validator) \
   --chain-id=gaia-7005
 ```