fix(fc-traits-gas-tank): return DispatchResult when calling `make_t…

…ank` to catch on attribute setting errors
virto-network · Dec 13, 2024 · 49f7d5f · 49f7d5f
1 parent 8dae394
commit 49f7d5f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/traits/gas-tank/src/impl_nonfungibles.rs b/traits/gas-tank/src/impl_nonfungibles.rs
@@ -41,11 +41,11 @@ where
         F::typed_system_attribute(collection_id, Some(item_id), &ATTR_MEMBERSHIP_GAS)
     }
 
-    fn put<F, I>(&self, collection_id: &F::CollectionId, item_id: &F::ItemId) -> Option<()>
+    fn put<F, I>(&self, collection_id: &F::CollectionId, item_id: &F::ItemId) -> DispatchResult
     where
         F: nonfungibles_v2::Inspect<T::AccountId> + nonfungibles_v2::Mutate<T::AccountId, I>,
     {
-        F::set_typed_attribute(collection_id, item_id, &ATTR_MEMBERSHIP_GAS, self).ok()
+        F::set_typed_attribute(collection_id, item_id, &ATTR_MEMBERSHIP_GAS, self)
     }
 }
 
@@ -190,7 +190,7 @@ where
         (collection_id, item_id): &Self::TankId,
         capacity: Option<Self::Gas>,
         periodicity: Option<Self::BlockNumber>,
-    ) -> Option<()> {
+    ) -> DispatchResult {
         WeightTank::<T>::new(capacity, periodicity).put::<F, ItemConfig>(collection_id, item_id)
     }
 }
diff --git a/traits/gas-tank/src/lib.rs b/traits/gas-tank/src/lib.rs
@@ -2,6 +2,7 @@
 
 use frame_support::Parameter;
 use sp_runtime::traits::BlockNumber;
+use sp_runtime::DispatchResult;
 
 #[cfg(test)]
 mod tests;
@@ -52,5 +53,5 @@ pub trait MakeTank {
         id: &Self::TankId,
         capacity: Option<Self::Gas>,
         periodicity: Option<Self::BlockNumber>,
-    ) -> Option<()>;
+    ) -> DispatchResult;
 }