From 29bdd663c251d6fe073dc3695e1cf7ec7a17b68d Mon Sep 17 00:00:00 2001
From: Sunny Aggarwal <sunnya97@gmail.com>
Date: Wed, 25 Jul 2018 16:05:43 -0700
Subject: [PATCH] fixed donotmodify bug

---
 x/stake/client/cli/flags.go     |  8 ++++----
 x/stake/types/validator.go      |  8 ++++----
 x/stake/types/validator_test.go | 18 +++++++++++++++---
 3 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/x/stake/client/cli/flags.go b/x/stake/client/cli/flags.go
index 79358f16d7..eae28ec3ed 100644
--- a/x/stake/client/cli/flags.go
+++ b/x/stake/client/cli/flags.go
@@ -37,10 +37,10 @@ func init() {
 	fsAmount.String(FlagAmount, "1steak", "Amount of coins to bond")
 	fsShares.String(FlagSharesAmount, "", "Amount of source-shares to either unbond or redelegate as a positive integer or decimal")
 	fsShares.String(FlagSharesPercent, "", "Percent of source-shares to either unbond or redelegate as a positive integer or decimal >0 and <=1")
-	fsDescription.String(FlagMoniker, "[do-not-modify]", "validator name")
-	fsDescription.String(FlagIdentity, "[do-not-modify]", "optional identity signature (ex. UPort or Keybase)")
-	fsDescription.String(FlagWebsite, "[do-not-modify]", "optional website")
-	fsDescription.String(FlagDetails, "[do-not-modify]", "optional details")
+	fsDescription.String(FlagMoniker, "", "validator name")
+	fsDescription.String(FlagIdentity, "", "optional identity signature (ex. UPort or Keybase)")
+	fsDescription.String(FlagWebsite, "", "optional website")
+	fsDescription.String(FlagDetails, "", "optional details")
 	fsValidator.String(FlagAddressValidator, "", "hex address of the validator")
 	fsDelegator.String(FlagAddressDelegator, "", "hex address of the delegator")
 	fsRedelegation.String(FlagAddressValidatorSrc, "", "hex address of the source validator")
diff --git a/x/stake/types/validator.go b/x/stake/types/validator.go
index 9c70d69da9..0a106dc04a 100644
--- a/x/stake/types/validator.go
+++ b/x/stake/types/validator.go
@@ -271,16 +271,16 @@ func NewDescription(moniker, identity, website, details string) Description {
 // UpdateDescription updates the fields of a given description. An error is
 // returned if the resulting description contains an invalid length.
 func (d Description) UpdateDescription(d2 Description) (Description, sdk.Error) {
-	if d.Moniker == doNotModifyDescVal {
+	if d2.Moniker == doNotModifyDescVal {
 		d2.Moniker = d.Moniker
 	}
-	if d.Identity == doNotModifyDescVal {
+	if d2.Identity == doNotModifyDescVal {
 		d2.Identity = d.Identity
 	}
-	if d.Website == doNotModifyDescVal {
+	if d2.Website == doNotModifyDescVal {
 		d2.Website = d.Website
 	}
-	if d.Details == doNotModifyDescVal {
+	if d2.Details == doNotModifyDescVal {
 		d2.Details = d.Details
 	}
 
diff --git a/x/stake/types/validator_test.go b/x/stake/types/validator_test.go
index 5e02520158..5e38a2a7fa 100644
--- a/x/stake/types/validator_test.go
+++ b/x/stake/types/validator_test.go
@@ -25,19 +25,31 @@ func TestValidatorEqual(t *testing.T) {
 
 func TestUpdateDescription(t *testing.T) {
 	d1 := Description{
+		Website: "https://validator.cosmos",
+		Details: "Test validator",
+	}
+
+	d2 := Description{
 		Moniker:  doNotModifyDescVal,
 		Identity: doNotModifyDescVal,
 		Website:  doNotModifyDescVal,
 		Details:  doNotModifyDescVal,
 	}
-	d2 := Description{
-		Website: "https://validator.cosmos",
-		Details: "Test validator",
+
+	d3 := Description{
+		Moniker:  "",
+		Identity: "",
+		Website:  "",
+		Details:  "",
 	}
 
 	d, err := d1.UpdateDescription(d2)
 	require.Nil(t, err)
 	require.Equal(t, d, d1)
+
+	d, err = d1.UpdateDescription(d3)
+	require.Nil(t, err)
+	require.Equal(t, d, d3)
 }
 
 func TestABCIValidator(t *testing.T) {