From cc619142db9ac45b89d78a5558ed4874eebf2084 Mon Sep 17 00:00:00 2001
From: Honza <zimulajan0@gmail.com>
Date: Thu, 2 Jan 2025 20:12:55 +0100
Subject: [PATCH] refac: resolved suggestions

---
 pallets/emission0/src/lib.rs      |  2 +-
 pallets/emission0/src/weights.rs  | 12 ++++++------
 pallets/governance/api/src/lib.rs |  4 ++--
 pallets/governance/src/lib.rs     |  6 +++---
 pallets/governance/src/roles.rs   |  3 +--
 pallets/torus0/src/lib.rs         |  2 +-
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/pallets/emission0/src/lib.rs b/pallets/emission0/src/lib.rs
index 7115bb8..4ce7449 100644
--- a/pallets/emission0/src/lib.rs
+++ b/pallets/emission0/src/lib.rs
@@ -88,7 +88,7 @@ pub mod pallet {
             <Self::Currency as Currency<Self::AccountId>>::NegativeImbalance,
         >;
 
-        type Governance: GovernanceApi<Self::AccountId, OriginFor<Self>>;
+        type Governance: GovernanceApi<Self::AccountId>;
     }
 
     #[pallet::pallet]
diff --git a/pallets/emission0/src/weights.rs b/pallets/emission0/src/weights.rs
index 6c70cc1..1eb665c 100644
--- a/pallets/emission0/src/weights.rs
+++ b/pallets/emission0/src/weights.rs
@@ -14,9 +14,9 @@ pub fn set_weights<T: crate::Config>(
     origin: OriginFor<T>,
     mut weights: sp_std::vec::Vec<(T::AccountId, u16)>,
 ) -> DispatchResult {
-    let acc_id = ensure_signed(origin.clone())?;
+    let acc_id = ensure_signed(origin)?;
 
-    <T::Governance>::ensure_allocator(origin)?;
+    <T::Governance>::ensure_allocator(&acc_id)?;
 
     ensure!(
         !crate::WeightControlDelegation::<T>::contains_key(&acc_id),
@@ -24,13 +24,13 @@ pub fn set_weights<T: crate::Config>(
     );
 
     ensure!(
-        <T::Torus>::is_agent_registered(&acc_id),
-        crate::Error::<T>::AgentIsNotRegistered
+        weights.len() <= crate::MaxAllowedWeights::<T>::get() as usize,
+        crate::Error::<T>::WeightSetTooLarge
     );
 
     ensure!(
-        weights.len() <= crate::MaxAllowedWeights::<T>::get() as usize,
-        crate::Error::<T>::WeightSetTooLarge
+        <T::Torus>::is_agent_registered(&acc_id),
+        crate::Error::<T>::AgentIsNotRegistered
     );
 
     let total_stake: u128 = <T::Torus>::staked_by(&acc_id)
diff --git a/pallets/governance/api/src/lib.rs b/pallets/governance/api/src/lib.rs
index dea389d..ad2b669 100644
--- a/pallets/governance/api/src/lib.rs
+++ b/pallets/governance/api/src/lib.rs
@@ -2,12 +2,12 @@
 
 use polkadot_sdk::{frame_support::dispatch::DispatchResult, sp_runtime::Percent};
 
-pub trait GovernanceApi<AccountId, Origin> {
+pub trait GovernanceApi<AccountId> {
     fn dao_treasury_address() -> AccountId;
 
     fn treasury_emission_fee() -> Percent;
 
     fn is_whitelisted(key: &AccountId) -> bool;
 
-    fn ensure_allocator(key: Origin) -> DispatchResult;
+    fn ensure_allocator(key: &AccountId) -> DispatchResult;
 }
diff --git a/pallets/governance/src/lib.rs b/pallets/governance/src/lib.rs
index 26a4daf..2fee42f 100644
--- a/pallets/governance/src/lib.rs
+++ b/pallets/governance/src/lib.rs
@@ -397,7 +397,7 @@ pub mod pallet {
     }
 }
 
-impl<T: Config> pallet_governance_api::GovernanceApi<T::AccountId, OriginFor<T>> for Pallet<T> {
+impl<T: Config> pallet_governance_api::GovernanceApi<T::AccountId> for Pallet<T> {
     fn dao_treasury_address() -> T::AccountId {
         DaoTreasuryAddress::<T>::get()
     }
@@ -410,7 +410,7 @@ impl<T: Config> pallet_governance_api::GovernanceApi<T::AccountId, OriginFor<T>>
         whitelist::is_whitelisted::<T>(key)
     }
 
-    fn ensure_allocator(origin: OriginFor<T>) -> DispatchResult {
-        crate::roles::ensure_allocator::<T>(origin)
+    fn ensure_allocator(key: &T::AccountId) -> DispatchResult {
+        crate::roles::ensure_allocator::<T>(key)
     }
 }
diff --git a/pallets/governance/src/roles.rs b/pallets/governance/src/roles.rs
index 380b51d..3111df6 100644
--- a/pallets/governance/src/roles.rs
+++ b/pallets/governance/src/roles.rs
@@ -48,8 +48,7 @@ pub fn ensure_curator<T: Config>(origin: OriginFor<T>) -> DispatchResult {
     Ok(())
 }
 
-pub fn ensure_allocator<T: Config>(origin: OriginFor<T>) -> DispatchResult {
-    let key: AccountIdOf<T> = ensure_signed(origin)?;
+pub fn ensure_allocator<T: Config>(key: &AccountIdOf<T>) -> DispatchResult {
     if !crate::Allocators::<T>::contains_key(key) {
         return Err(Error::<T>::NotAllocator.into());
     }
diff --git a/pallets/torus0/src/lib.rs b/pallets/torus0/src/lib.rs
index 1ae86e8..769b564 100644
--- a/pallets/torus0/src/lib.rs
+++ b/pallets/torus0/src/lib.rs
@@ -205,7 +205,7 @@ pub mod pallet {
 
         type Currency: Currency<Self::AccountId, Balance = u128> + Send + Sync;
 
-        type Governance: GovernanceApi<Self::AccountId, Self::RuntimeOrigin>;
+        type Governance: GovernanceApi<Self::AccountId>;
 
         type Emission: Emission0Api<Self::AccountId>;
     }