fix problems with querying tally params

proto/cosmos/gov/v1beta1/gov.proto

@@ -201,7 +201,7 @@ message TallyParams {
   bytes expedited_threshold = 3 [
     (gogoproto.customtype) = "github.com/cosmos/cosmos-sdk/types.Dec",
     (gogoproto.nullable)   = false,
-    (gogoproto.jsontag)    = "threshold,omitempty"
+    (gogoproto.jsontag)    = "expedited_threshold,omitempty"
   ];
 
   //  Minimum value of Veto votes to Total votes ratio for proposal to be

x/gov/client/rest/grpc_query_test.go

@@ -1,3 +1,4 @@
+//go:build norace
 // +build norace
 
 package rest_test

x/gov/client/testutil/cli_test.go

@@ -1,3 +1,4 @@
+//go:build norace
 // +build norace
 
 package testutil
@@ -21,7 +22,7 @@ func TestIntegrationTestSuite(t *testing.T) {
 
 	genesisState := types.DefaultGenesisState()
 	genesisState.DepositParams = types.NewDepositParams(sdk.NewCoins(sdk.NewCoin(cfg.BondDenom, types.DefaultMinDepositTokens)), time.Duration(15)*time.Second)
-	genesisState.VotingParams = types.NewVotingParams(time.Duration(5) * time.Second)
+	genesisState.VotingParams = types.NewVotingParams(time.Duration(5)*time.Second, time.Duration(2)*time.Second)
 	bz, err := cfg.Codec.MarshalJSON(genesisState)
 	require.NoError(t, err)
 	cfg.GenesisState["gov"] = bz

x/gov/simulation/genesis.go

@@ -112,7 +112,7 @@ func RandomizedGenState(simState *module.SimulationState) {
 		startingProposalID,
 		types.NewDepositParams(minDeposit, depositPeriod),
 		types.NewVotingParams(votingPeriod, expeditedVotingPeriod),
-		types.NewTallyParams(quorum, threshold, veto, expeditedThreshold),
+		types.NewTallyParams(quorum, threshold, expeditedThreshold, veto),
 	)
 
 	bz, err := json.MarshalIndent(&govGenesis, "", " ")

x/gov/types/genesis.go

@@ -50,6 +50,18 @@ func ValidateGenesis(data *GenesisState) error {
 			threshold.String())
 	}
 
+	expeditedThreshold := data.TallyParams.ExpeditedThreshold
+	if expeditedThreshold.IsNegative() || expeditedThreshold.GT(sdk.OneDec()) {
+		return fmt.Errorf("governance expedited vote threshold should be positive and less or equal to one, is %s",
+			expeditedThreshold)
+	}
+
+	if expeditedThreshold.LT(threshold) {
+		return fmt.Errorf("expedited governance vote threshold %s should be greater than or equal to regular threshold %s",
+			expeditedThreshold,
+			threshold)
+	}
+
 	veto := data.TallyParams.VetoThreshold
 	if veto.IsNegative() || veto.GT(sdk.OneDec()) {
 		return fmt.Errorf("governance vote veto threshold should be positive and less or equal to one, is %s",

x/gov/types/params.go

@@ -109,7 +109,7 @@ func (tp TallyParams) GetThreshold(isExpedited bool) sdk.Dec {
 
 // Equal checks equality of TallyParams
 func (tp TallyParams) Equal(other TallyParams) bool {
-	return tp.Quorum.Equal(other.Quorum) && tp.Threshold.Equal(other.Threshold) && tp.VetoThreshold.Equal(other.VetoThreshold)
+	return tp.Quorum.Equal(other.Quorum) && tp.Threshold.Equal(other.Threshold) && tp.ExpeditedThreshold.Equal(other.ExpeditedThreshold) && tp.VetoThreshold.Equal(other.VetoThreshold)
 }
 
 // String implements stringer insterface
@@ -137,7 +137,7 @@ func validateTallyParams(i interface{}) error {
 		return fmt.Errorf("vote threshold too large: %s", v.Threshold)
 	}
 	if !v.ExpeditedThreshold.IsPositive() {
-		return fmt.Errorf("expedited ote threshold must be positive: %s", v.Threshold)
+		return fmt.Errorf("expedited ote threshold must be positive: %s", v.ExpeditedThreshold)
 	}
 	if v.ExpeditedThreshold.GT(sdk.OneDec()) {
 		return fmt.Errorf("expedited vote threshold too large: %s", v.ExpeditedThreshold)