From b55913ddad8730c4dc69dd03e03596c8b49f68ed Mon Sep 17 00:00:00 2001
From: antstalepresh <stalepresh121@outlook.com>
Date: Sat, 6 Feb 2021 00:57:12 +1000
Subject: [PATCH] fix comments and add CHANGELOG

---
 CHANGELOG.md                                |  1 +
 docs/architecture/adr-037-gov-split-vote.md |  2 +-
 x/gov/client/utils/utils_test.go            | 56 +++++++++++++++++++++
 x/gov/keeper/tally_test.go                  |  1 +
 x/gov/types/msgs.go                         |  4 ++
 x/gov/types/vote.go                         | 13 +++--
 6 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 x/gov/client/utils/utils_test.go

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cab64e9c9..93f994e4f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -38,6 +38,7 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ### Improvements
 
+* (x/gov) [\#7733](https://github.com/cosmos/cosmos-sdk/pull/7733) ADR 037 Implementation: Governance Split Votes
 * (x/bank) [\#8302](https://github.com/cosmos/cosmos-sdk/issues/8302) Add gRPC and CLI queries for client denomination metadata.
 * (tendermint) [\#8316](https://github.com/cosmos/cosmos-sdk/pull/8316) Bump Tendermint version to [v0.34.2](https://github.com/tendermint/tendermint/releases/tag/v0.34.2)
 
diff --git a/docs/architecture/adr-037-gov-split-vote.md b/docs/architecture/adr-037-gov-split-vote.md
index ccc93e8bf..3dfa59cca 100644
--- a/docs/architecture/adr-037-gov-split-vote.md
+++ b/docs/architecture/adr-037-gov-split-vote.md
@@ -6,7 +6,7 @@
 
 ## Status
 
-Proposed
+Accepted
 
 ## Abstract
 
diff --git a/x/gov/client/utils/utils_test.go b/x/gov/client/utils/utils_test.go
new file mode 100644
index 000000000..0da66b3c2
--- /dev/null
+++ b/x/gov/client/utils/utils_test.go
@@ -0,0 +1,56 @@
+package utils
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestNormalizeWeightedVoteOptions(t *testing.T) {
+	cases := map[string]struct {
+		options    string
+		normalized string
+	}{
+		"simple Yes": {
+			options:    "Yes",
+			normalized: "VOTE_OPTION_YES=1",
+		},
+		"simple yes": {
+			options:    "yes",
+			normalized: "VOTE_OPTION_YES=1",
+		},
+		"formal yes": {
+			options:    "yes=1",
+			normalized: "VOTE_OPTION_YES=1",
+		},
+		"half yes half no": {
+			options:    "yes=0.5,no=0.5",
+			normalized: "VOTE_OPTION_YES=0.5,VOTE_OPTION_NO=0.5",
+		},
+		"3 options": {
+			options:    "Yes=0.5,No=0.4,NoWithVeto=0.1",
+			normalized: "VOTE_OPTION_YES=0.5,VOTE_OPTION_NO=0.4,VOTE_OPTION_NO_WITH_VETO=0.1",
+		},
+		"zero weight option": {
+			options:    "Yes=0.5,No=0.5,NoWithVeto=0",
+			normalized: "VOTE_OPTION_YES=0.5,VOTE_OPTION_NO=0.5,VOTE_OPTION_NO_WITH_VETO=0",
+		},
+		"minus weight option": {
+			options:    "Yes=0.5,No=0.6,NoWithVeto=-0.1",
+			normalized: "VOTE_OPTION_YES=0.5,VOTE_OPTION_NO=0.6,VOTE_OPTION_NO_WITH_VETO=-0.1",
+		},
+		"empty options": {
+			options:    "",
+			normalized: "=1",
+		},
+		"not available option": {
+			options:    "Yessss=1",
+			normalized: "Yessss=1",
+		},
+	}
+
+	for _, tc := range cases {
+		normalized := NormalizeWeightedVoteOptions(tc.options)
+		require.Equal(t, normalized, tc.normalized)
+	}
+}
diff --git a/x/gov/keeper/tally_test.go b/x/gov/keeper/tally_test.go
index 89e4a7c2b..ef9cbd027 100644
--- a/x/gov/keeper/tally_test.go
+++ b/x/gov/keeper/tally_test.go
@@ -423,6 +423,7 @@ func TestTallyJailedValidator(t *testing.T) {
 
 	require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[0], types.NewNonSplitVoteOption(types.OptionYes)))
 	require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[1], types.NewNonSplitVoteOption(types.OptionNo)))
+	require.NoError(t, app.GovKeeper.AddVote(ctx, proposalID, addrs[2], types.NewNonSplitVoteOption(types.OptionNo)))
 
 	proposal, ok := app.GovKeeper.GetProposal(ctx, proposalID)
 	require.True(t, ok)
diff --git a/x/gov/types/msgs.go b/x/gov/types/msgs.go
index 157c088d5..f1c351e6d 100644
--- a/x/gov/types/msgs.go
+++ b/x/gov/types/msgs.go
@@ -258,6 +258,10 @@ func (msg MsgVoteWeighted) ValidateBasic() error {
 		return sdkerrors.Wrap(ErrInvalidVote, "Total weight overflow 1.00")
 	}
 
+	if totalWeight.LT(sdk.NewDec(1)) {
+		return sdkerrors.Wrap(ErrInvalidVote, "Total weight lower than 1.00")
+	}
+
 	return nil
 }
 
diff --git a/x/gov/types/vote.go b/x/gov/types/vote.go
index dc88be0ec..baa61920a 100644
--- a/x/gov/types/vote.go
+++ b/x/gov/types/vote.go
@@ -1,13 +1,13 @@
 package types
 
 import (
-	"encoding/json"
 	"fmt"
 	"strings"
 
 	yaml "gopkg.in/yaml.v2"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	proto "github.com/gogo/protobuf/proto"
 )
 
 // NewVote creates a new Vote instance
@@ -62,16 +62,19 @@ func NewNonSplitVoteOption(option VoteOption) WeightedVoteOptions {
 }
 
 func (v WeightedVoteOption) String() string {
-	out, _ := json.Marshal(v)
+	out, _ := proto.Marshal(&v)
 	return string(out)
 }
 
 // WeightedVoteOptions describes array of WeightedVoteOptions
 type WeightedVoteOptions []WeightedVoteOption
 
-func (v WeightedVoteOptions) String() string {
-	out, _ := json.Marshal(v)
-	return string(out)
+func (v WeightedVoteOptions) String() (out string) {
+	for _, opt := range v {
+		out += opt.String() + "\n"
+	}
+
+	return strings.TrimSpace(out)
 }
 
 // ValidWeightedVoteOption returns true if the sub vote is valid and false otherwise.