Feature/fixes after halborn second round (#199)

* Fix for HAL-06 - Removed unnecessary code. * Fix for HAL-04 - Now it is impossible to submit job proof when Grace period has started.
make-software · May 21, 2024 · 9fb15f5 · 9fb15f5
1 parent 20c04d2
commit 9fb15f5
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 35 deletions.
diff --git a/dao/src/bid_escrow/job.rs b/dao/src/bid_escrow/job.rs
@@ -226,8 +226,8 @@ impl Job {
             revert(Error::OnlyWorkerCanSubmitProof);
         }
 
-        if self.finish_time() + self.grace_period() < request.block_time {
-            revert(Error::JobProofSubmittedAfterGracePeriod);
+        if self.finish_time() < request.block_time {
+            revert(Error::JobProofSubmittedAfterFinishTime);
         }
 
         self.job_proof = Some(request.proof);

diff --git a/dao/src/utils/errors.rs b/dao/src/utils/errors.rs
@@ -114,7 +114,7 @@ execution_error! {
         BidAlreadyPicked => 4038,
         BidCanceled => 4039,
         BidRejected => 4040,
-        JobProofSubmittedAfterGracePeriod => 4041,
+        JobProofSubmittedAfterFinishTime => 4041,
 
         // Reputation Token Errors.
         CannotStakeTwice => 4500,

diff --git a/dao/src/voting_contracts/simple_voter.rs b/dao/src/voting_contracts/simple_voter.rs
@@ -1,14 +1,14 @@
 use odra::{
     contract_env::caller,
     types::{event::OdraEvent, Address, Balance, BlockTime},
-    Event, Mapping, UnwrapOrRevert,
+    Event, Mapping,
 };
 
 use crate::voting_contracts::SlashedVotings;
 use crate::{
     configuration::ConfigurationBuilder,
     modules::{refs::ContractRefs, AccessControl},
-    utils::{types::DocumentHash, Error},
+    utils::types::DocumentHash,
     voting::{
         ballot::{Ballot, Choice},
         types::VotingId,
@@ -51,6 +51,7 @@ impl SimpleVoterContract {
             ) -> Option<Ballot>;
             pub fn get_voter(&self, voting_id: VotingId, voting_type: VotingType, at: u32) -> Option<Address>;
             pub fn cancel_finished_voting(&mut self, voting_id: VotingId);
+            pub fn finish_voting(&mut self, voting_id: VotingId, voting_type: VotingType) -> VotingSummary;
         }
 
         to self.access_control {
@@ -98,20 +99,6 @@ impl SimpleVoterContract {
         SimpleVotingCreated::new(document_hash, info).emit();
     }
 
-    pub fn finish_voting(&mut self, voting_id: VotingId, voting_type: VotingType) -> VotingSummary {
-        let voting_summary = self.voting_engine.finish_voting(voting_id, voting_type);
-
-        if let VotingType::Formal = voting_summary.voting_type() {
-            self.simple_votings.set(
-                &voting_id,
-                self.simple_votings
-                    .get(&voting_id)
-                    .unwrap_or_revert_with(Error::VariableValueNotSet),
-            );
-        }
-        voting_summary
-    }
-
     pub fn get_document_hash(&self, voting_id: VotingId) -> Option<DocumentHash> {
         self.simple_votings.get(&voting_id)
     }

diff --git a/dao/tests/steps/bid_escrow.rs b/dao/tests/steps/bid_escrow.rs
@@ -268,7 +268,7 @@ fn bid_pick_failed(w: &mut DaoWorld, job_poster: Account, worker: Account) {
 fn submit_outdated_job_proof(w: &mut DaoWorld, worker: Account, job_id: JobId) {
     let worker = w.get_address(&worker);
     test_env::set_caller(worker);
-    test_env::assert_exception(Error::JobProofSubmittedAfterGracePeriod, || {
+    test_env::assert_exception(Error::JobProofSubmittedAfterFinishTime, || {
         w.bid_escrow
             .submit_job_proof(job_id, DocumentHash::from("Job Proof"));
     });

diff --git a/resources/simple_voter_contract_schema.json b/resources/simple_voter_contract_schema.json
@@ -35,21 +35,6 @@
       ],
       "return_ty": "Unit"
     },
-    {
-      "name": "finish_voting",
-      "is_mutable": true,
-      "args": [
-        {
-          "name": "voting_id",
-          "ty": "U32"
-        },
-        {
-          "name": "voting_type",
-          "ty": "U32"
-        }
-      ],
-      "return_ty": "Any"
-    },
     {
       "name": "get_document_hash",
       "is_mutable": false,
@@ -178,6 +163,21 @@
       ],
       "return_ty": "Unit"
     },
+    {
+      "name": "finish_voting",
+      "is_mutable": true,
+      "args": [
+        {
+          "name": "voting_id",
+          "ty": "U32"
+        },
+        {
+          "name": "voting_type",
+          "ty": "U32"
+        }
+      ],
+      "return_ty": "Any"
+    },
     {
       "name": "propose_new_owner",
       "is_mutable": true,