change(pallet-communities): solve testing issues

virto-network · May 14, 2024 · d630577 · d630577
1 parent abe6837
commit d630577
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/pallets/communities/src/benchmarking.rs b/pallets/communities/src/benchmarking.rs
@@ -3,18 +3,17 @@
 use super::*;
 
 use self::{
-	origin::DecisionMethod,
 	types::{
 		AccountIdOf, AssetIdOf, CommunityIdOf, DecisionMethodFor, MembershipIdOf, NativeBalanceOf, PalletsOriginOf,
 		PollIndexOf, RuntimeCallFor, Vote,
 	},
-	CommunityDecisionMethod, Event, HoldReason, Pallet as Communities,
+	CommunityDecisionMethod, DecisionMethod, Event, HoldReason, Pallet as Communities,
 };
 use fc_traits_memberships::{Inspect, Rank};
 use frame_benchmarking::v2::*;
 use frame_support::traits::{
 	fungible::{InspectFreeze, Mutate},
-	fungibles::{Create, Mutate as FunsMutate},
+	fungibles::Mutate as FunsMutate,
 	OriginTrait,
 };
 use frame_system::{
@@ -197,7 +196,7 @@ mod benchmarks {
 		_(
 			admin_origin,
 			id,
-			DecisionMethod::CommunityAsset(T::BenchmarkHelper::community_asset_id()),
+			DecisionMethod::CommunityAsset(T::BenchmarkHelper::community_asset_id(), 10u128.into()),
 		);
 
 		// verification code
@@ -316,7 +315,7 @@ mod benchmarks {
 		// setup code
 		let (id, origin) = create_community::<T>(
 			RawOrigin::Root.into(),
-			Some(DecisionMethodFor::<T>::CommunityAsset(1u32.into())),
+			Some(DecisionMethodFor::<T>::CommunityAsset(1u32.into(), 1u128.into())),
 		)?;
 		let members = setup_members::<T>(origin.clone(), id)?;
 
@@ -325,9 +324,6 @@ mod benchmarks {
 			.expect("desired size of community to be equal or greather than 1")
 			.clone();
 
-		let community_account = Communities::<T>::community_account(&id);
-
-		T::Assets::create(1u32.into(), community_account, false, 1u128.into())?;
 		T::Assets::mint_into(1u32.into(), &who, 4u128.into())?;
 
 		prepare_track_and_prepare_poll::<T>(origin.into_caller(), who.clone())?;

diff --git a/pallets/communities/src/functions.rs b/pallets/communities/src/functions.rs
@@ -96,7 +96,7 @@ impl<T: Config> Pallet<T> {
 
 			let say = *match (vote, decision_method) {
 				(Vote::AssetBalance(say, asset, amount), DecisionMethod::CommunityAsset(a, min)) if asset == a => {
-					ensure!(amount > min, Error::<T>::VoteBelowMinimum);
+					ensure!(amount >= min, Error::<T>::VoteBelowMinimum);
 					say
 				}
 				(Vote::NativeBalance(say, ..), DecisionMethod::NativeToken)

diff --git a/pallets/communities/src/tests/governance.rs b/pallets/communities/src/tests/governance.rs
@@ -551,15 +551,15 @@ mod vote {
 						RuntimeOrigin::signed(BOB),
 						membership(COMMUNITY_B, 1),
 						1,
-						Vote::AssetBalance(true, COMMUNITY_B_ASSET_ID, 10)
+						Vote::AssetBalance(true, COMMUNITY_B_ASSET_ID, 9)
 					),
 					Error::VoteBelowMinimum
 				);
 				assert_ok!(Communities::vote(
 					RuntimeOrigin::signed(BOB),
 					membership(COMMUNITY_B, 1),
 					1,
-					Vote::AssetBalance(true, COMMUNITY_B_ASSET_ID, 11)
+					Vote::AssetBalance(true, COMMUNITY_B_ASSET_ID, 10)
 				));
 			});
 		}