fix: Fix handling duplicate values in UniqueMultimap

NoirHQ · Sep 5, 2024 · 9cce2bd · 9cce2bd
1 parent ccb1443
commit 9cce2bd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/frame/multimap/src/tests.rs b/frame/multimap/src/tests.rs
@@ -29,6 +29,9 @@ fn unique_multimap_works() {
 
 		// overflow capacity per
 		assert!(matches!(Multimap::try_insert(0, 1002), Err(Error::<Test>::CapacityOverflow)));
+		assert!(matches!(Multimap::try_insert(0, 1001), Ok(false)));
+		assert_eq!(Multimap::get(0), BTreeSet::from_iter(vec![1000, 1001]));
+
 		// duplicate value
 		assert!(matches!(Multimap::try_insert(1, 1000), Err(Error::<Test>::DuplicateValue)));
 

diff --git a/frame/multimap/src/traits.rs b/frame/multimap/src/traits.rs
@@ -45,7 +45,10 @@ impl<T: Config<I>, I: 'static> UniqueMultimap<T::Key, T::Value> for Pallet<T, I>
 
 	fn try_insert(key: T::Key, value: T::Value) -> Result<bool, Error<T, I>> {
 		Map::<T, I>::try_mutate(&key, |values| {
-			ensure!(!Index::<T, I>::contains_key(&value), Error::<T, I>::DuplicateValue);
+			ensure!(
+				Index::<T, I>::get(&value).filter(|k| *k != key).is_none(),
+				Error::<T, I>::DuplicateValue
+			);
 			values
 				.try_insert(value.clone())
 				.inspect(|ok| {