make crowdloan refund before the end possible

Author: l0r1s

pallets/crowdloan/src/lib.rs

@@ -547,7 +547,7 @@ pub mod pallet {
             Ok(())
         }
 
-        /// Finalize a successful crowdloan.
+        /// Finalize crowdloan that has reached the cap.
         ///
         /// The call will transfer the raised amount to the target address if it was provided when the crowdloan was created
         /// and dispatch the call that was provided using the creator origin. The CurrentCrowdloanId will be set to the
@@ -619,7 +619,7 @@ pub mod pallet {
             Ok(())
         }
 
-        /// Refund a failed crowdloan.
+        /// Refund a crowdloan that has not reached the cap and has ended.
         ///
         /// The call will try to refund all contributors (excluding the creator) up to the limit defined by the `RefundContributorsLimit`.
         /// If the limit is reached, the call will stop and the crowdloan will be marked as partially refunded.
@@ -635,13 +635,11 @@ pub mod pallet {
             origin: OriginFor<T>,
             #[pallet::compact] crowdloan_id: CrowdloanId,
         ) -> DispatchResultWithPostInfo {
-            let now = frame_system::Pallet::<T>::block_number();
             ensure_signed(origin)?;
 
             let mut crowdloan = Self::ensure_crowdloan_exists(crowdloan_id)?;
 
-            // Ensure the crowdloan has ended and is not finalized
-            ensure!(now >= crowdloan.end, Error::<T>::ContributionPeriodNotEnded);
+            // Ensure the crowdloan is not finalized
             ensure!(!crowdloan.finalized, Error::<T>::AlreadyFinalized);
 
             let mut refunded_contributors: Vec<T::AccountId> = vec![];

pallets/crowdloan/src/tests.rs

@@ -1534,8 +1534,8 @@ fn test_refund_succeeds() {
                     .is_some_and(|c| c.contributors_count == 7)
             );
 
-            // run some more blocks past the end of the contribution period
-            run_to_block(60);
+            // run some more blocks before the end of the contribution period
+            run_to_block(20);
 
             //  first round of refund
             assert_ok!(Crowdloan::refund(
@@ -1563,7 +1563,7 @@ fn test_refund_succeeds() {
                 pallet_crowdloan::Event::<Test>::PartiallyRefunded { crowdloan_id }.into()
             );
 
-            // run some more blocks
+            // run some more blocks past the end of the contribution period
             run_to_block(70);
 
             //  second round of refund
@@ -1649,39 +1649,6 @@ fn test_refund_fails_if_crowdloan_does_not_exist() {
         });
 }
 
-#[test]
-fn test_refund_fails_if_crowdloan_has_not_ended() {
-    TestState::default()
-        .with_balance(U256::from(1), 100)
-        .build_and_execute(|| {
-            // create a crowdloan
-            let creator: AccountOf<Test> = U256::from(1);
-            let initial_deposit: BalanceOf<Test> = 50;
-            let min_contribution: BalanceOf<Test> = 10;
-            let cap: BalanceOf<Test> = 300;
-            let end: BlockNumberFor<Test> = 50;
-            assert_ok!(Crowdloan::create(
-                RuntimeOrigin::signed(creator),
-                initial_deposit,
-                min_contribution,
-                cap,
-                end,
-                Some(noop_call()),
-                None,
-            ));
-
-            // run some blocks
-            run_to_block(10);
-
-            // try to refund
-            let crowdloan_id: CrowdloanId = 0;
-            assert_err!(
-                Crowdloan::refund(RuntimeOrigin::signed(creator), crowdloan_id),
-                pallet_crowdloan::Error::<Test>::ContributionPeriodNotEnded
-            );
-        });
-}
-
 #[test]
 fn test_dissolve_succeeds() {
     TestState::default()