Rename submetagraph to mechagraph in RPC calls

gztensor · gztensor · commit 0d421e51ae66 · 2025-09-17T12:33:37.000-04:00
diff --git a/pallets/subtensor/rpc/src/lib.rs b/pallets/subtensor/rpc/src/lib.rs
@@ -72,10 +72,10 @@ pub trait SubtensorCustomApi<BlockHash> {
     fn get_all_metagraphs(&self, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
     #[method(name = "subnetInfo_getMetagraph")]
     fn get_metagraph(&self, netuid: NetUid, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
-    #[method(name = "subnetInfo_getAllSubMetagraphs")]
-    fn get_all_submetagraphs(&self, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
-    #[method(name = "subnetInfo_getSubMetagraph")]
-    fn get_submetagraph(
+    #[method(name = "subnetInfo_getAllMechagraphs")]
+    fn get_all_mechagraphs(&self, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
+    #[method(name = "subnetInfo_getMechagraph")]
+    fn get_mechagraph(
         &self,
         netuid: NetUid,
         mecid: MechId,
@@ -92,8 +92,8 @@ pub trait SubtensorCustomApi<BlockHash> {
         metagraph_index: Vec<u16>,
         at: Option<BlockHash>,
     ) -> RpcResult<Vec<u8>>;
-    #[method(name = "subnetInfo_getSelectiveSubMetagraph")]
-    fn get_selective_submetagraph(
+    #[method(name = "subnetInfo_getSelectiveMechagraph")]
+    fn get_selective_mechagraph(
         &self,
         netuid: NetUid,
         mecid: MechId,
@@ -336,11 +336,11 @@ where
         }
     }
 
-    fn get_all_submetagraphs(&self, at: Option<<Block as BlockT>::Hash>) -> RpcResult<Vec<u8>> {
+    fn get_all_mechagraphs(&self, at: Option<<Block as BlockT>::Hash>) -> RpcResult<Vec<u8>> {
         let api = self.client.runtime_api();
         let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
-        match api.get_all_submetagraphs(at) {
+        match api.get_all_mechagraphs(at) {
             Ok(result) => Ok(result.encode()),
             Err(e) => Err(Error::RuntimeError(format!("Unable to get metagraps: {e:?}")).into()),
         }
@@ -379,15 +379,15 @@ where
         }
     }
 
-    fn get_submetagraph(
+    fn get_mechagraph(
         &self,
         netuid: NetUid,
         mecid: MechId,
         at: Option<<Block as BlockT>::Hash>,
     ) -> RpcResult<Vec<u8>> {
         let api = self.client.runtime_api();
         let at = at.unwrap_or_else(|| self.client.info().best_hash);
-        match api.get_submetagraph(at, netuid, mecid) {
+        match api.get_mechagraph(at, netuid, mecid) {
             Ok(result) => Ok(result.encode()),
             Err(e) => Err(Error::RuntimeError(format!(
                 "Unable to get dynamic subnets info: {e:?}"
@@ -472,7 +472,7 @@ where
         }
     }
 
-    fn get_selective_submetagraph(
+    fn get_selective_mechagraph(
         &self,
         netuid: NetUid,
         mecid: MechId,
@@ -482,7 +482,7 @@ where
         let api = self.client.runtime_api();
         let at = at.unwrap_or_else(|| self.client.info().best_hash);
 
-        match api.get_selective_submetagraph(at, netuid, mecid, metagraph_index) {
+        match api.get_selective_mechagraph(at, netuid, mecid, metagraph_index) {
             Ok(result) => Ok(result.encode()),
             Err(e) => {
                 Err(Error::RuntimeError(format!("Unable to get selective metagraph: {e:?}")).into())
diff --git a/pallets/subtensor/runtime-api/src/lib.rs b/pallets/subtensor/runtime-api/src/lib.rs
@@ -40,12 +40,12 @@ sp_api::decl_runtime_apis! {
         fn get_all_dynamic_info() -> Vec<Option<DynamicInfo<AccountId32>>>;
         fn get_all_metagraphs() -> Vec<Option<Metagraph<AccountId32>>>;
         fn get_metagraph(netuid: NetUid) -> Option<Metagraph<AccountId32>>;
-        fn get_all_submetagraphs() -> Vec<Option<Metagraph<AccountId32>>>;
-        fn get_submetagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<AccountId32>>;
+        fn get_all_mechagraphs() -> Vec<Option<Metagraph<AccountId32>>>;
+        fn get_mechagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<AccountId32>>;
         fn get_dynamic_info(netuid: NetUid) -> Option<DynamicInfo<AccountId32>>;
         fn get_subnet_state(netuid: NetUid) -> Option<SubnetState<AccountId32>>;
         fn get_selective_metagraph(netuid: NetUid, metagraph_indexes: Vec<u16>) -> Option<SelectiveMetagraph<AccountId32>>;
-        fn get_selective_submetagraph(netuid: NetUid, mecid: MechId, metagraph_indexes: Vec<u16>) -> Option<SelectiveMetagraph<AccountId32>>;
+        fn get_selective_mechagraph(netuid: NetUid, mecid: MechId, metagraph_indexes: Vec<u16>) -> Option<SelectiveMetagraph<AccountId32>>;
     }
 
     pub trait StakeInfoRuntimeApi {
diff --git a/pallets/subtensor/src/rpc_info/metagraph.rs b/pallets/subtensor/src/rpc_info/metagraph.rs
@@ -805,7 +805,7 @@ impl<T: Config> Pallet<T> {
         metagraphs
     }
 
-    pub fn get_submetagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<T::AccountId>> {
+    pub fn get_mechagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<T::AccountId>> {
         if Self::ensure_mechanism_exists(netuid, mecid).is_err() {
             return None;
         }
@@ -832,13 +832,13 @@ impl<T: Config> Pallet<T> {
         }
     }
 
-    pub fn get_all_submetagraphs() -> Vec<Option<Metagraph<T::AccountId>>> {
+    pub fn get_all_mechagraphs() -> Vec<Option<Metagraph<T::AccountId>>> {
         let netuids = Self::get_all_subnet_netuids();
         let mut metagraphs = Vec::<Option<Metagraph<T::AccountId>>>::new();
         for netuid in netuids.clone().iter() {
             let mechanism_count = u8::from(MechanismCountCurrent::<T>::get(netuid));
             for mecid in 0..mechanism_count {
-                metagraphs.push(Self::get_submetagraph(*netuid, MechId::from(mecid)));
+                metagraphs.push(Self::get_mechagraph(*netuid, MechId::from(mecid)));
             }
         }
         metagraphs
@@ -860,7 +860,7 @@ impl<T: Config> Pallet<T> {
         }
     }
 
-    pub fn get_selective_submetagraph(
+    pub fn get_selective_mechagraph(
         netuid: NetUid,
         mecid: MechId,
         metagraph_indexes: Vec<u16>,
@@ -870,7 +870,7 @@ impl<T: Config> Pallet<T> {
         } else {
             let mut result = SelectiveMetagraph::default();
             for index in metagraph_indexes.iter() {
-                let value = Self::get_single_selective_submetagraph(netuid, mecid, *index);
+                let value = Self::get_single_selective_mechagraph(netuid, mecid, *index);
                 result.merge_value(&value, *index as usize);
             }
             Some(result)
@@ -1441,7 +1441,7 @@ impl<T: Config> Pallet<T> {
         }
     }
 
-    fn get_single_selective_submetagraph(
+    fn get_single_selective_mechagraph(
         netuid: NetUid,
         mecid: MechId,
         metagraph_index: u16,
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
@@ -2334,8 +2334,8 @@ impl_runtime_apis! {
             SubtensorModule::get_metagraph(netuid)
         }
 
-        fn get_submetagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<AccountId32>> {
-            SubtensorModule::get_submetagraph(netuid, mecid)
+        fn get_mechagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<AccountId32>> {
+            SubtensorModule::get_mechagraph(netuid, mecid)
         }
 
         fn get_subnet_state(netuid: NetUid) -> Option<SubnetState<AccountId32>> {
@@ -2346,8 +2346,8 @@ impl_runtime_apis! {
             SubtensorModule::get_all_metagraphs()
         }
 
-        fn get_all_submetagraphs() -> Vec<Option<Metagraph<AccountId32>>> {
-            SubtensorModule::get_all_submetagraphs()
+        fn get_all_mechagraphs() -> Vec<Option<Metagraph<AccountId32>>> {
+            SubtensorModule::get_all_mechagraphs()
         }
 
         fn get_all_dynamic_info() -> Vec<Option<DynamicInfo<AccountId32>>> {
@@ -2358,8 +2358,8 @@ impl_runtime_apis! {
             SubtensorModule::get_selective_metagraph(netuid, metagraph_indexes)
         }
 
-        fn get_selective_submetagraph(netuid: NetUid, mecid: MechId, metagraph_indexes: Vec<u16>) -> Option<SelectiveMetagraph<AccountId32>> {
-            SubtensorModule::get_selective_submetagraph(netuid, mecid, metagraph_indexes)
+        fn get_selective_mechagraph(netuid: NetUid, mecid: MechId, metagraph_indexes: Vec<u16>) -> Option<SelectiveMetagraph<AccountId32>> {
+            SubtensorModule::get_selective_mechagraph(netuid, mecid, metagraph_indexes)
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -805,7 +805,7 @@ impl<T: Config> Pallet<T> {`
`805`	`805`	`metagraphs`
`806`	`806`	`}`
`807`	`807`
`808`		`- pub fn get_submetagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<T::AccountId>> {`
	`808`	`+ pub fn get_mechagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<T::AccountId>> {`
`809`	`809`	`if Self::ensure_mechanism_exists(netuid, mecid).is_err() {`
`810`	`810`	`return None;`
`811`	`811`	`}`
`@@ -832,13 +832,13 @@ impl<T: Config> Pallet<T> {`
`832`	`832`	`}`
`833`	`833`	`}`
`834`	`834`
`835`		`- pub fn get_all_submetagraphs() -> Vec<Option<Metagraph<T::AccountId>>> {`
	`835`	`+ pub fn get_all_mechagraphs() -> Vec<Option<Metagraph<T::AccountId>>> {`
`836`	`836`	`let netuids = Self::get_all_subnet_netuids();`
`837`	`837`	`let mut metagraphs = Vec::<Option<Metagraph<T::AccountId>>>::new();`
`838`	`838`	`for netuid in netuids.clone().iter() {`
`839`	`839`	`let mechanism_count = u8::from(MechanismCountCurrent::<T>::get(netuid));`
`840`	`840`	`for mecid in 0..mechanism_count {`
`841`		`- metagraphs.push(Self::get_submetagraph(*netuid, MechId::from(mecid)));`
	`841`	`+ metagraphs.push(Self::get_mechagraph(*netuid, MechId::from(mecid)));`
`842`	`842`	`}`
`843`	`843`	`}`
`844`	`844`	`metagraphs`
`@@ -860,7 +860,7 @@ impl<T: Config> Pallet<T> {`
`860`	`860`	`}`
`861`	`861`	`}`
`862`	`862`
`863`		`- pub fn get_selective_submetagraph(`
	`863`	`+ pub fn get_selective_mechagraph(`
`864`	`864`	`netuid: NetUid,`
`865`	`865`	`mecid: MechId,`
`866`	`866`	`metagraph_indexes: Vec<u16>,`
`@@ -870,7 +870,7 @@ impl<T: Config> Pallet<T> {`
`870`	`870`	`} else {`
`871`	`871`	`let mut result = SelectiveMetagraph::default();`
`872`	`872`	`for index in metagraph_indexes.iter() {`
`873`		`- let value = Self::get_single_selective_submetagraph(netuid, mecid, *index);`
	`873`	`+ let value = Self::get_single_selective_mechagraph(netuid, mecid, *index);`
`874`	`874`	`result.merge_value(&value, *index as usize);`
`875`	`875`	`}`
`876`	`876`	`Some(result)`
`@@ -1441,7 +1441,7 @@ impl<T: Config> Pallet<T> {`
`1441`	`1441`	`}`
`1442`	`1442`	`}`
`1443`	`1443`
`1444`		`- fn get_single_selective_submetagraph(`
	`1444`	`+ fn get_single_selective_mechagraph(`
`1445`	`1445`	`netuid: NetUid,`
`1446`	`1446`	`mecid: MechId,`
`1447`	`1447`	`metagraph_index: u16,`
Original file line number	Diff line number	Diff line change
`@@ -2334,8 +2334,8 @@ impl_runtime_apis! {`
`2334`	`2334`	`SubtensorModule::get_metagraph(netuid)`
`2335`	`2335`	`}`
`2336`	`2336`
`2337`		`- fn get_submetagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<AccountId32>> {`
`2338`		`- SubtensorModule::get_submetagraph(netuid, mecid)`
	`2337`	`+ fn get_mechagraph(netuid: NetUid, mecid: MechId) -> Option<Metagraph<AccountId32>> {`
	`2338`	`+ SubtensorModule::get_mechagraph(netuid, mecid)`
`2339`	`2339`	`}`
`2340`	`2340`
`2341`	`2341`	`fn get_subnet_state(netuid: NetUid) -> Option<SubnetState<AccountId32>> {`
`@@ -2346,8 +2346,8 @@ impl_runtime_apis! {`
`2346`	`2346`	`SubtensorModule::get_all_metagraphs()`
`2347`	`2347`	`}`
`2348`	`2348`
`2349`		`- fn get_all_submetagraphs() -> Vec<Option<Metagraph<AccountId32>>> {`
`2350`		`- SubtensorModule::get_all_submetagraphs()`
	`2349`	`+ fn get_all_mechagraphs() -> Vec<Option<Metagraph<AccountId32>>> {`
	`2350`	`+ SubtensorModule::get_all_mechagraphs()`
`2351`	`2351`	`}`
`2352`	`2352`
`2353`	`2353`	`fn get_all_dynamic_info() -> Vec<Option<DynamicInfo<AccountId32>>> {`
`@@ -2358,8 +2358,8 @@ impl_runtime_apis! {`
`2358`	`2358`	`SubtensorModule::get_selective_metagraph(netuid, metagraph_indexes)`
`2359`	`2359`	`}`
`2360`	`2360`
`2361`		`- fn get_selective_submetagraph(netuid: NetUid, mecid: MechId, metagraph_indexes: Vec<u16>) -> Option<SelectiveMetagraph<AccountId32>> {`
`2362`		`- SubtensorModule::get_selective_submetagraph(netuid, mecid, metagraph_indexes)`
	`2361`	`+ fn get_selective_mechagraph(netuid: NetUid, mecid: MechId, metagraph_indexes: Vec<u16>) -> Option<SelectiveMetagraph<AccountId32>> {`
	`2362`	`+ SubtensorModule::get_selective_mechagraph(netuid, mecid, metagraph_indexes)`
`2363`	`2363`	`}`
`2364`	`2364`	`}`
`2365`	`2365`