FEAT: Fixed both unit tests #457 (#459)

feat: Fixed both unit tests #457

Author: brandonpille

substrate-node/pallets/pallet-dao/src/lib.rs

@@ -212,6 +212,16 @@ pub mod pallet {
                 Error::<T>::DuplicateProposal
             );
 
+            let now = frame_system::Pallet::<T>::block_number();
+            let mut end = now + T::MotionDuration::get();
+            if let Some(motion_duration) = duration {
+                ensure!(
+                    motion_duration < T::BlockNumber::from(constants::time::DAYS * 30),
+                    Error::<T>::InvalidProposalDuration
+                );
+                end = now + motion_duration;
+            }
+
             let index = Self::proposal_count();
             <ProposalCount<T>>::mutate(|i| *i += 1);
             <ProposalOf<T>>::insert(proposal_hash, *action);
@@ -223,16 +233,6 @@ pub mod pallet {
             };
             <Proposals<T>>::insert(proposal_hash, p);
 
-            let now = frame_system::Pallet::<T>::block_number();
-            let mut end = now + T::MotionDuration::get();
-            if let Some(motion_duration) = duration {
-                ensure!(
-                    motion_duration < T::BlockNumber::from(constants::time::DAYS * 30),
-                    Error::<T>::InvalidProposalDuration
-                );
-                end = now + motion_duration;
-            }
-
             let votes = {
                 proposal::DaoVotes {
                     index,

substrate-node/runtime/src/constants.rs

@@ -86,7 +86,7 @@ pub mod fee {
 
 #[cfg(test)]
 mod tests {
-    use super::currency::{CENTS, DOLLARS, MILLICENTS};
+    use super::currency::{CENTS, MILLICENTS};
     use super::fee::WeightToFeeStruct;
     use crate::MaximumBlockWeight;
     use frame_support::weights::constants::ExtrinsicBaseWeight;
@@ -95,18 +95,18 @@ mod tests {
     #[test]
     // This function tests that the fee for `MaximumBlockWeight` of weight is correct
     fn full_block_fee_is_correct() {
-        // A full block should cost 16 DOLLARS
-        println!("Base: {}", ExtrinsicBaseWeight::get());
+        // A full block should cost 23.3112 DOLLARS
+        log::info!("MaxBlockWeight: {:?}", MaximumBlockWeight::get());
         let x = WeightToFeeStruct::weight_to_fee(&MaximumBlockWeight::get());
-        let y = 16 * DOLLARS;
+        let y = 2331120 * MILLICENTS;
         assert!(x.max(y) - x.min(y) < MILLICENTS);
     }
 
     #[test]
     // This function tests that the fee for `ExtrinsicBaseWeight` of weight is correct
     fn extrinsic_base_fee_is_correct() {
         // `ExtrinsicBaseWeight` should cost 1/10 of a CENT
-        println!("Base: {}", ExtrinsicBaseWeight::get());
+        log::info!("Base: {}", ExtrinsicBaseWeight::get());
         let x = WeightToFeeStruct::weight_to_fee(&ExtrinsicBaseWeight::get());
         let y = CENTS / 10;
         assert!(x.max(y) - x.min(y) < MILLICENTS);