Remove get_prometheus and get_pruning_score from pallet-subtensor::Pa…

…llet
opentensor · Dec 16, 2024 · c28300f · c28300f
1 parent c250ffd
commit c28300f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/pallets/subtensor/src/rpc_info/neuron_info.rs b/pallets/subtensor/src/rpc_info/neuron_info.rs
@@ -79,7 +79,7 @@ impl<T: Config> Pallet<T> {
 
         let axon_info = Axons::<T>::get(netuid, &hotkey).unwrap_or_default();
 
-        let prometheus_info = Self::get_prometheus_info(netuid, &hotkey);
+        let prometheus_info = Prometheus::<T>::get(netuid, &hotkey).unwrap_or_default();
 
         let coldkey = Owner::<T>::get(hotkey.clone()).clone();
 
@@ -162,7 +162,7 @@ impl<T: Config> Pallet<T> {
 
         let axon_info = Axons::<T>::get(netuid, &hotkey).unwrap_or_default();
 
-        let prometheus_info = Self::get_prometheus_info(netuid, &hotkey);
+        let prometheus_info = Prometheus::<T>::get(netuid, &hotkey).unwrap_or_default();
 
         let coldkey = Owner::<T>::get(&hotkey).clone();
 

diff --git a/pallets/subtensor/src/subnets/serving.rs b/pallets/subtensor/src/subnets/serving.rs
@@ -191,7 +191,7 @@ impl<T: Config> Pallet<T> {
         );
 
         // We get the previous axon info assoicated with this ( netuid, uid )
-        let mut prev_prometheus = Self::get_prometheus_info(netuid, &hotkey_id);
+        let mut prev_prometheus = Prometheus::<T>::get(netuid, &hotkey_id).unwrap_or_default();
         let current_block: u64 = Self::get_current_block_as_u64();
         ensure!(
             Self::prometheus_passes_rate_limit(netuid, &prev_prometheus, current_block),
@@ -247,20 +247,6 @@ impl<T: Config> Pallet<T> {
         rate_limit == 0 || last_serve == 0 || current_block.saturating_sub(last_serve) >= rate_limit
     }
 
-    pub fn get_prometheus_info(netuid: u16, hotkey: &T::AccountId) -> PrometheusInfoOf {
-        if let Some(prometheus) = Prometheus::<T>::get(netuid, hotkey) {
-            prometheus
-        } else {
-            PrometheusInfo {
-                block: 0,
-                version: 0,
-                ip: 0,
-                port: 0,
-                ip_type: 0,
-            }
-        }
-    }
-
     pub fn is_valid_ip_type(ip_type: u8) -> bool {
         let allowed_values = [4, 6];
         allowed_values.contains(&ip_type)

diff --git a/pallets/subtensor/src/tests/serving.rs b/pallets/subtensor/src/tests/serving.rs
@@ -384,7 +384,7 @@ fn test_prometheus_serving_ok() {
             port,
             ip_type
         ));
-        let neuron = SubtensorModule::get_prometheus_info(netuid, &hotkey_account_id);
+        let neuron = Prometheus::<Test>::get(netuid, hotkey_account_id).unwrap_or_default();
         assert_eq!(neuron.ip, ip);
         assert_eq!(neuron.version, version);
         assert_eq!(neuron.port, port);
@@ -413,7 +413,7 @@ fn test_prometheus_serving_set_metadata_update() {
             port,
             ip_type
         ));
-        let neuron = SubtensorModule::get_prometheus_info(netuid, &hotkey_account_id);
+        let neuron = Prometheus::<Test>::get(netuid, hotkey_account_id).unwrap_or_default();
         assert_eq!(neuron.ip, ip);
         assert_eq!(neuron.version, version);
         assert_eq!(neuron.port, port);
@@ -430,7 +430,7 @@ fn test_prometheus_serving_set_metadata_update() {
             port2,
             ip_type2
         ));
-        let neuron = SubtensorModule::get_prometheus_info(netuid, &hotkey_account_id);
+        let neuron = Prometheus::<Test>::get(netuid, hotkey_account_id).unwrap_or_default();
         assert_eq!(neuron.ip, ip2);
         assert_eq!(neuron.version, version2);
         assert_eq!(neuron.port, port2);

diff --git a/pallets/subtensor/src/utils/misc.rs b/pallets/subtensor/src/utils/misc.rs
@@ -75,9 +75,6 @@ impl<T: Config> Pallet<T> {
         Trust::<T>::get(netuid)
     }
 
-    pub fn get_pruning_score(netuid: u16) -> Vec<u16> {
-        PruningScores::<T>::get(netuid)
-    }
     pub fn get_validator_trust(netuid: u16) -> Vec<u16> {
         ValidatorTrust::<T>::get(netuid)
     }