Browse Source

fixed tests

ignazio 3 years ago
parent
commit
fdc3bc6324

+ 5 - 1
runtime-modules/content/src/lib.rs

@@ -819,6 +819,7 @@ decl_module! {
                 // can delete non-empty dynamic bag
                 Storage::<T>::can_delete_dynamic_bag_with_objects(
                     &dyn_bag,
+
                 )?;
 
                 Storage::<T>::can_delete_data_objects(
@@ -1462,7 +1463,10 @@ impl<T: Trait> Module<T> {
         if channel_creation && Storage::<T>::ensure_bag_exists(&bag_id).is_err() {
             Storage::<T>::create_dynamic_bag_with_objects_constraints(
                 dyn_bag,
-                None,
+                Some(storage::DynamicBagDeletionPrize::<T> {
+                    prize: One::one(), // TODO: fix prize
+                    account_id: prize_source_account.clone(),
+                }),
                 upload_params.clone(),
             )?;
         };

+ 4 - 4
runtime-modules/content/src/tests/channels.rs

@@ -17,7 +17,7 @@ fn successful_channel_deletion() {
         // create an account with enought balance
         let _ = balances::Module::<Test>::deposit_creating(
             &FIRST_MEMBER_ORIGIN,
-            <Test as balances::Trait>::Balance::from(100u32),
+            <Test as balances::Trait>::Balance::from(INITIAL_BALANCE),
         );
 
         // 3 assets added at creation
@@ -105,7 +105,7 @@ fn successful_channel_assets_deletion() {
         // create an account with enought balance
         let _ = balances::Module::<Test>::deposit_creating(
             &FIRST_MEMBER_ORIGIN,
-            <Test as balances::Trait>::Balance::from(100u32),
+            <Test as balances::Trait>::Balance::from(INITIAL_BALANCE),
         );
 
         // 3 assets
@@ -171,7 +171,7 @@ fn succesful_channel_update() {
         // create an account with enought balance
         let _ = balances::Module::<Test>::deposit_creating(
             &FIRST_MEMBER_ORIGIN,
-            <Test as balances::Trait>::Balance::from(100u32),
+            <Test as balances::Trait>::Balance::from(INITIAL_BALANCE),
         );
 
         // 2 + 1 assets to be uploaded
@@ -264,7 +264,7 @@ fn succesful_channel_creation() {
         // create an account with enought balance
         let _ = balances::Module::<Test>::deposit_creating(
             &FIRST_MEMBER_ORIGIN,
-            <Test as balances::Trait>::Balance::from(100u32),
+            <Test as balances::Trait>::Balance::from(INITIAL_BALANCE),
         );
 
         // 3 assets to be uploaded

+ 2 - 2
runtime-modules/content/src/tests/mock.rs

@@ -52,7 +52,7 @@ pub const COLLABORATOR_MEMBER_ID: MemberId = 9;
 
 /// Constants
 // initial balancer for an account
-pub const INIT_BALANCE: u32 = 500;
+pub const INITIAL_BALANCE: u32 = 1_000_000;
 
 impl_outer_origin! {
     pub enum Origin for Test {}
@@ -658,7 +658,7 @@ pub fn helper_init_accounts(accounts: Vec<u64>) {
     for acc in accounts.iter() {
         let _ = balances::Module::<Test>::deposit_creating(
             acc,
-            <Test as balances::Trait>::Balance::from(INIT_BALANCE),
+            <Test as balances::Trait>::Balance::from(INITIAL_BALANCE),
         );
     }
 }

+ 2 - 2
runtime-modules/content/src/tests/videos.rs

@@ -33,7 +33,7 @@ fn video_creation_successful() {
         // depositi initial balance
         let _ = balances::Module::<Test>::deposit_creating(
             &FIRST_MEMBER_ORIGIN,
-            <Test as balances::Trait>::Balance::from(100u32),
+            <Test as balances::Trait>::Balance::from(INITIAL_BALANCE),
         );
 
         let channel_id = NextChannelId::<Test>::get();
@@ -81,7 +81,7 @@ fn video_update_successful() {
         create_initial_storage_buckets();
         let _ = balances::Module::<Test>::deposit_creating(
             &FIRST_MEMBER_ORIGIN,
-            <Test as balances::Trait>::Balance::from(100u32),
+            <Test as balances::Trait>::Balance::from(INITIAL_BALANCE),
         );
 
         let channel_id = NextChannelId::<Test>::get();

+ 6 - 1
runtime-modules/storage/src/lib.rs

@@ -2849,7 +2849,7 @@ impl<T: Trait> Module<T> {
         Self::ensure_sufficient_balance_for_upload(
             deletion_prize
                 .as_ref()
-                .map(|del_prize| del_prize.account_id.clone()),
+                .map(|deletion_prize| deletion_prize.account_id.clone()),
             total_upload_fee,
         )?;
 
@@ -2864,6 +2864,11 @@ impl<T: Trait> Module<T> {
             Balances::<T>::usable_balance(account_id)
         });
 
+        println!(
+            "TOTAL UPLOAD FEE: \t {:?}\nBALANCE: \t {:?}",
+            required_balance, usable_balance
+        );
+
         ensure!(
             usable_balance >= required_balance,
             Error::<T>::InsufficientBalance