fixes

ImbueNetwork · Nov 21, 2023 · f5ebbce · f5ebbce
1 parent 445f8f6
commit f5ebbce
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 43 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -17,7 +17,6 @@ members = [
 	"pallets/proposals",
 	"pallets/briefs",
 	"pallets/grants",
-	"pallets/crowdfunding",
 	"pallets/deposits",
 	"pallets/disputes",
 	"pallets/fellowship",

diff --git a/pallets/proposals/src/impls/pallet_impls.rs b/pallets/proposals/src/impls/pallet_impls.rs
@@ -103,34 +103,30 @@ impl<T: Config> Pallet<T> {
                     } else {
                         vote.nay = vote.nay.saturating_add(contribution_amount);
                     }
-
-                    //check if the everyone has voted and its still less than the
-                    // funding threshold just reject it
-                    if vote.yay + vote.nay == project.raised_funds && vote.yay < funding_threshold {
-                        Self::close_voting_round(project_key, user_has_voted_key)?;
-                        Self::deposit_event(Event::MilestoneRejected(project_key, milestone_key));
-                    }
                     Ok::<Vote<BalanceOf<T>>, DispatchError>(vote.clone())
                 } else {
                     Err(Error::<T>::VotingRoundNotStarted.into())
                 }
             })?;
 
+            Self::deposit_event(Event::VoteSubmitted(
+                who.clone(),
+                project_key,
+                milestone_key,
+                approve_milestone,
+                now,
+            ));
+
         Self::try_auto_finalise_milestone_voting(
             project_key,
             &vote,
             funding_threshold,
             user_has_voted_key,
-            who.clone(),
+            who,
+            project.raised_funds,
         )?;
 
-        Self::deposit_event(Event::VoteSubmitted(
-            who,
-            project_key,
-            milestone_key,
-            approve_milestone,
-            now,
-        ));
+
         Ok(().into())
     }
 
@@ -437,6 +433,7 @@ impl<T: Config> Pallet<T> {
         funding_threshold: BalanceOf<T>,
         user_has_voted_key: (ProjectKey, RoundType, MilestoneKey),
         who: AccountIdOf<T>,
+        raised_funds: BalanceOf<T>,
     ) -> Result<(), DispatchError> {
         // If the yay votes is over the funding threshold then the milestone is approved.
         if vote.yay >= funding_threshold {
@@ -458,7 +455,7 @@ impl<T: Config> Pallet<T> {
             ));
         }
 
-        if vote.nay >= funding_threshold {
+        if vote.nay >= funding_threshold || (vote.yay.saturating_add(vote.nay) == raised_funds && vote.yay < funding_threshold) {
             Self::close_voting_round(project_key, user_has_voted_key)?;
             Self::deposit_event(Event::MilestoneRejected(
                 user_has_voted_key.0,

diff --git a/pallets/proposals/src/mock.rs b/pallets/proposals/src/mock.rs
@@ -235,6 +235,7 @@ pub static ALICE: AccountId = 125;
 pub static BOB: AccountId = 126;
 pub static CHARLIE: AccountId = 127;
 pub static DAVE: AccountId = 128;
+pub static STEVE: AccountId = 254;
 pub static JOHN: AccountId = 255;
 
 pub(crate) fn build_test_externality() -> sp_io::TestExternalities {
@@ -251,6 +252,7 @@ pub(crate) fn build_test_externality() -> sp_io::TestExternalities {
         let _ = Tokens::deposit(CurrencyId::Native, &CHARLIE, initial_balance);
         let _ = Tokens::deposit(CurrencyId::Native, &DAVE, initial_balance);
         let _ = Tokens::deposit(CurrencyId::Native, &JOHN, initial_balance);
+        let _ = Tokens::deposit(CurrencyId::Native, &STEVE, initial_balance);
     });
     ext
 }

diff --git a/pallets/proposals/src/tests/pallet.rs b/pallets/proposals/src/tests/pallet.rs
@@ -553,6 +553,46 @@ fn vote_on_milestone_actually_adds_to_vote() {
     });
 }
 
+#[test]
+fn vote_on_milestone_autofinalises_on_all_voted_and_fail() {
+    build_test_externality().execute_with(|| {
+        let cont = get_contributions::<Test>(vec![BOB, CHARLIE, DAVE], 100_000);
+        let prop_milestones = get_milestones(10);
+        let project_key = create_project::<Test>(ALICE, cont, prop_milestones, CurrencyId::Native);
+        let milestone_key = 0;
+        assert_ok!(Proposals::submit_milestone(
+            RuntimeOrigin::signed(ALICE),
+            project_key,
+            milestone_key
+        ));
+        assert_ok!(Proposals::vote_on_milestone(
+            RuntimeOrigin::signed(BOB),
+            project_key,
+            milestone_key,
+            false
+        ));
+        assert_ok!(Proposals::vote_on_milestone(
+            RuntimeOrigin::signed(CHARLIE),
+            project_key,
+            milestone_key,
+            false
+        ));
+        assert_ok!(Proposals::vote_on_milestone(
+            RuntimeOrigin::signed(DAVE),
+            project_key,
+            milestone_key,
+            true
+        ));
+
+
+
+        assert_last_event::<Test>(
+            Event::<Test>::MilestoneRejected(project_key, milestone_key).into()
+        )
+    });
+}
+
+
 #[test]
 fn withdraw_not_initiator() {
     build_test_externality().execute_with(|| {