Merge pull request #340 from anoma/fix-governance-result-2

fix gov result

Author: Fraccaman

governance/src/repository/governance.rs

@@ -89,9 +89,10 @@ pub fn get_all_executed_proposals(
     governance_proposals::table
         .filter(
             governance_proposals::dsl::result
-                .eq(GovernanceProposalResultDb::Passed)
-                .or(governance_proposals::dsl::result
-                    .eq(GovernanceProposalResultDb::Rejected))
+                .eq_any([
+                    GovernanceProposalResultDb::Passed,
+                    GovernanceProposalResultDb::Rejected,
+                ])
                 .and(
                     governance_proposals::dsl::activation_epoch
                         .le(current_epoch as i32),

orm/src/governance_proposal.rs

@@ -68,7 +68,9 @@ impl From<GovernanceProposalResult> for GovernanceProposalResultDb {
             GovernanceProposalResult::VotingPeriod => Self::VotingPeriod,
             GovernanceProposalResult::Pending => Self::Pending,
             GovernanceProposalResult::ExecutedPassed => Self::ExecutedPassed,
-            GovernanceProposalResult::ExecutedRejected => Self::Pending,
+            GovernanceProposalResult::ExecutedRejected => {
+                Self::ExecutedRejected
+            }
             GovernanceProposalResult::Unknown => Self::Unknown,
         }
     }