Merge pull request #1693 from cosmos/cwgoes/governance-cli-test-fixes

Governance CLI test fixes
cosmos · Jul 16, 2018 · 6687de6 · 6687de6
2 parents 2cbe566 + 566bf8e
commit 6687de6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/x/gov/keeper.go b/x/gov/keeper.go
@@ -129,7 +129,7 @@ func (keeper Keeper) activateVotingPeriod(ctx sdk.Context, proposal Proposal) {
 // Procedures
 
 var (
-	defaultMinDeposit       int64 = 100
+	defaultMinDeposit       int64 = 10
 	defaultMaxDepositPeriod int64 = 10000
 	defaultVotingPeriod     int64 = 10000
 )

diff --git a/x/gov/proposals.go b/x/gov/proposals.go
@@ -60,7 +60,7 @@ type TextProposal struct {
 	Description  string       `json:"description"`   //  Description of the proposal
 	ProposalType ProposalKind `json:"proposal_type"` //  Type of proposal. Initial set {PlainTextProposal, SoftwareUpgradeProposal}
 
-	Status ProposalStatus `json:"string"` //  Status of the Proposal {Pending, Active, Passed, Rejected}
+	Status ProposalStatus `json:"proposal_status"` //  Status of the Proposal {Pending, Active, Passed, Rejected}
 
 	SubmitBlock  int64     `json:"submit_block"`  //  Height of the block where TxGovSubmitProposal was included
 	TotalDeposit sdk.Coins `json:"total_deposit"` //  Current deposit on this proposal. Initial value is set at InitialDeposit
@@ -184,7 +184,7 @@ func (pt ProposalKind) Format(s fmt.State, verb rune) {
 	case 's':
 		s.Write([]byte(fmt.Sprintf("%s", pt.String())))
 	default:
-		s.Write([]byte(fmt.Sprintf("%v", pt)))
+		s.Write([]byte(fmt.Sprintf("%v", byte(pt))))
 	}
 }
 
@@ -283,6 +283,6 @@ func (status ProposalStatus) Format(s fmt.State, verb rune) {
 	case 's':
 		s.Write([]byte(fmt.Sprintf("%s", status.String())))
 	default:
-		s.Write([]byte(fmt.Sprintf("%v", status)))
+		s.Write([]byte(fmt.Sprintf("%v", byte(status))))
 	}
 }