update

near-ndc · Aug 21, 2023 · b24620c · b24620c
1 parent f3a9d7c
commit b24620c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/elections/src/proposal.rs b/elections/src/proposal.rs
@@ -168,13 +168,13 @@ impl Proposal {
     }
 
     /// returns proposal status
-    pub fn status(&self) -> ProposalStatus {
-        let current_time = env::block_timestamp_ms();
-        if current_time < self.start {
+    /// now: time in miliseconds
+    pub fn status(&self, now: u64) -> ProposalStatus {
+        if now < self.start {
             return ProposalStatus::NOT_STARTED;
-        } else if current_time <= self.end {
+        } else if now <= self.end {
             return ProposalStatus::ONGOING;
-        } else if current_time <= self.cooldown + self.end {
+        } else if now <= self.cooldown + self.end {
             return ProposalStatus::COOLDOWN;
         } else {
             return ProposalStatus::ENDED;

diff --git a/elections/src/view.rs b/elections/src/view.rs
@@ -1,4 +1,4 @@
-use near_sdk::{near_bindgen, AccountId};
+use near_sdk::{near_bindgen, AccountId, env};
 use uint::hex;
 
 use crate::proposal::*;
@@ -35,6 +35,7 @@ impl Contract {
 
     /// Returns the proposal status
     pub fn proposal_status(&self, prop_id: u32) -> Option<ProposalStatus> {
-        return self.proposals.get(&prop_id).map(|p| p.status())
+        let now = env::block_timestamp_ms();
+        return self.proposals.get(&prop_id).map(|p| p.status(now))
     }
 }