Browse Source

account check roll back

ignazio 3 years ago
parent
commit
fe90c57a04
2 changed files with 6 additions and 18 deletions
  1. 0 1
      runtime-modules/content/src/lib.rs
  2. 6 17
      runtime-modules/storage/src/lib.rs

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

@@ -732,7 +732,6 @@ decl_module! {
             // channel creation
             let channel: Channel<T> = ChannelRecord {
                 owner: channel_owner,
-                // a newly create channel has zero videos ??
                 num_videos: 0u64,
                 is_censored: false,
                 reward_account: params.reward_account.clone(),

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

@@ -2815,19 +2815,6 @@ impl<T: Trait> Module<T> {
         }
     }
 
-    fn ensure_upload_and_deletion_prize_account_are_coherent(
-        deletion_prize: &Option<DynamicBagDeletionPrize<T>>,
-        params: &UploadParameters<T>,
-    ) -> DispatchResult {
-        ensure!(deletion_prize.is_some(), Error::<T>::AccountsNotCoherent,);
-        if let Some(deletion_prize) = deletion_prize {
-            ensure!(
-                params.deletion_prize_source_account_id == deletion_prize.account_id,
-                Error::<T>::AccountsNotCoherent,
-            );
-        }
-        Ok(())
-    }
     // Validates dynamic bag creation params and conditions.
     fn validate_create_dynamic_bag_params(
         dynamic_bag_id: &DynamicBagId<T>,
@@ -2845,10 +2832,12 @@ impl<T: Trait> Module<T> {
             .as_ref()
             .map(|params| {
                 // ensure coherent account ids for prize
-                Self::ensure_upload_and_deletion_prize_account_are_coherent(
-                    &deletion_prize,
-                    params,
-                )?;
+                if let Some(deletion_prize) = deletion_prize {
+                    ensure!(
+                        params.deletion_prize_source_account_id == deletion_prize.account_id,
+                        Error::<T>::AccountsNotCoherent,
+                    );
+                }
                 Self::validate_bag_change(params)
             })
             .transpose()?;