feat(pallet): prefer module key

commune-ai · Mar 24, 2024 · 736f280 · 736f280
1 parent 9cd78ad
commit 736f280
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 57 deletions.
diff --git a/pallets/subspace/rpc/runtime-api/src/lib.rs b/pallets/subspace/rpc/runtime-api/src/lib.rs
@@ -39,19 +39,9 @@ pub struct ModuleInfo {
     pub stats: ModuleStats,
 }
 
-// sp_api::decl_runtime_apis! {
-// 	pub trait SubspaceRuntimeApi where
-// 	AccountId: <<Signature as Verify>::Signer as IdentifyAccount>::AccountId
-// 	{
-// 		fn get_module_info() -> Result<ModuleInfo>;
-// 	}
-// }
-
 sp_api::decl_runtime_apis! {
-    pub trait SubspaceRuntimeApi
-    {
+    pub trait SubspaceRuntimeApi {
         fn get_burn_rate() -> u16;
-
         fn get_module_info(key: AccountId, netuid: u16) -> ModuleInfo;
     }
 }
diff --git a/pallets/subspace/src/lib.rs b/pallets/subspace/src/lib.rs
@@ -268,7 +268,7 @@ pub mod pallet {
     pub struct ModuleParams<T: Config> {
         pub name: Vec<u8>,
         pub address: Vec<u8>,
-        pub delegation_fee: Percent, // delegate_fee
+        pub delegation_fee: Percent,
         pub controller: T::AccountId,
     }
 
@@ -1202,8 +1202,8 @@ pub mod pallet {
         ) -> DispatchResult {
             let key = ensure_signed(origin.clone())?;
             ensure!(Self::is_registered(netuid, &key), Error::<T>::NotRegistered);
-            let uid: u16 = Self::get_uid_for_key(netuid, &key);
-            let params = Self::module_params(netuid, uid);
+
+            let params = Self::module_params(netuid, &key);
 
             let changeset = ModuleChangeset::update(&params, name, address, delegation_fee);
             Self::do_update_module(origin, netuid, changeset)

diff --git a/pallets/subspace/src/module.rs b/pallets/subspace/src/module.rs
@@ -18,12 +18,6 @@ pub struct ModuleStats<T: Config> {
     pub weights: Vec<(u16, u16)>, // Vec of (uid, weight)
 }
 
-#[derive(Decode, Encode, PartialEq, Eq, Clone, Debug)]
-pub struct ModuleInfo<T: Config> {
-    params: ModuleParams<T>,
-    stats: ModuleStats<T>,
-}
-
 #[derive(Debug)]
 pub struct ModuleChangeset {
     pub name: Option<Vec<u8>>,
@@ -32,6 +26,7 @@ pub struct ModuleChangeset {
 }
 
 impl ModuleChangeset {
+    #[must_use]
     pub fn new(name: Vec<u8>, address: Vec<u8>) -> Self {
         Self {
             name: Some(name),
@@ -40,6 +35,7 @@ impl ModuleChangeset {
         }
     }
 
+    #[must_use]
     pub fn update<T: Config>(
         params: &ModuleParams<T>,
         name: Vec<u8>,
@@ -110,42 +106,17 @@ impl<T: Config> Pallet<T> {
         Ok(())
     }
 
-    pub fn module_params(netuid: u16, uid: u16) -> ModuleParams<T> {
+    pub fn module_params(netuid: u16, key: &T::AccountId) -> ModuleParams<T> {
+        let uid = Uids::<T>::try_get(netuid, key).expect("module key does not exist");
+
         ModuleParams {
-            name: Self::get_module_name(netuid, uid),
-            address: Self::get_module_address(netuid, uid),
-            delegation_fee: Self::get_module_delegation_fee(netuid, uid),
-            controller: Self::get_key_for_uid(netuid, uid),
+            name: Name::<T>::get(netuid, uid),
+            address: Address::<T>::get(netuid, uid),
+            delegation_fee: DelegationFee::<T>::get(netuid, key),
+            controller: key.clone(),
         }
     }
 
-    pub fn get_module_address(netuid: u16, uid: u16) -> Vec<u8> {
-        Address::<T>::get(netuid, uid)
-    }
-
-    pub fn set_module_address(netuid: u16, uid: u16, address: Vec<u8>) {
-        Address::<T>::insert(netuid, uid, address);
-    }
-
-    pub fn get_module_delegation_fee(netuid: u16, uid: u16) -> Percent {
-        let key = Self::get_key_for_uid(netuid, uid);
-        let delegation_fee: Percent = DelegationFee::<T>::get(netuid, key);
-        delegation_fee
-    }
-
-    pub fn set_module_delegation_fee(netuid: u16, uid: u16, delegation_fee: Percent) {
-        let key = Self::get_key_for_uid(netuid, uid);
-        DelegationFee::<T>::insert(netuid, key, delegation_fee);
-    }
-
-    pub fn get_module_name(netuid: u16, uid: u16) -> Vec<u8> {
-        Name::<T>::get(netuid, uid)
-    }
-
-    pub fn set_module_name(netuid: u16, uid: u16, name: Vec<u8>) {
-        Name::<T>::insert(netuid, uid, name.clone());
-    }
-
     // Replace the module under this uid.
     pub fn remove_module(netuid: u16, uid: u16) {
         // 1. Get the old key under this position.
@@ -269,7 +240,9 @@ impl<T: Config> Pallet<T> {
         Ok(uid)
     }
 
-    pub fn get_module_stats(netuid: u16, uid: u16) -> ModuleStats<T> {
+    pub fn get_module_stats(netuid: u16, key: &T::AccountId) -> ModuleStats<T> {
+        let uid = Uids::<T>::try_get(netuid, key).expect("module key does not exist");
+
         let key = Self::get_key_for_uid(netuid, uid);
         let emission = Self::get_emission_for_uid(netuid, uid);
         let incentive = Self::get_incentive_for_uid(netuid, uid);

diff --git a/pallets/subspace/tests/registration.rs b/pallets/subspace/tests/registration.rs
@@ -278,7 +278,7 @@ fn validates_module_on_update() {
         assert_ok!(update_module(b"test2", b"0.0.0.0:2"));
         assert_ok!(update_module(b"test3", b"0.0.0.0:3"));
 
-        let params = SubspaceModule::module_params(0, 1);
+        let params = SubspaceModule::module_params(0, &key_1);
         assert_eq!(params.name, b"test3");
         assert_eq!(params.address, b"0.0.0.0:3");
 

diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -1025,9 +1025,8 @@ impl_runtime_apis! {
         }
 
         fn get_module_info(key: AccountId, netuid: u16) -> ModuleInfo {
-            let uid = SubspaceModule::get_uid_for_key(netuid, &key);
-            let stats = SubspaceModule::get_module_stats(netuid, uid);
-            let params = SubspaceModule::module_params(netuid, uid);
+            let stats = SubspaceModule::get_module_stats(netuid, &key);
+            let params = SubspaceModule::module_params(netuid, &key);
 
             ModuleInfo {
                 stats: ModuleStats {