fix merge

Author: JohnReedV

pallets/admin-utils/src/lib.rs

@@ -953,7 +953,7 @@ pub mod pallet {
         /// The extrinsic sets the commit/reveal interval for a subnet.
         /// It is only callable by the root account or subnet owner.
         /// The extrinsic will call the Subtensor pallet to set the interval.
-        #[pallet::call_index(47)]
+        #[pallet::call_index(48)]
         #[pallet::weight(T::WeightInfo::sudo_set_commit_reveal_weights_interval())]
         pub fn sudo_set_commit_reveal_weights_interval(
             origin: OriginFor<T>,
@@ -979,7 +979,7 @@ pub mod pallet {
         /// The extrinsic enabled/disables commit/reaveal for a given subnet.
         /// It is only callable by the root account or subnet owner.
         /// The extrinsic will call the Subtensor pallet to set the value.
-        #[pallet::call_index(48)]
+        #[pallet::call_index(49)]
         #[pallet::weight(T::WeightInfo::sudo_set_commit_reveal_weights_enabled())]
         pub fn sudo_set_commit_reveal_weights_enabled(
             origin: OriginFor<T>,

pallets/subtensor/src/errors.rs

@@ -119,7 +119,7 @@ mod errors {
         /// No commit found for the provided hotkey+netuid combination when attempting to reveal the weights.
         NoWeightsCommitFound,
         /// Not the correct block/range to reveal weights.
-        InvalidRevealCommitHashNotMatchTempo,
+        InvalidRevealCommitTempo,
         /// Committed hash does not equal the hashed reveal data.
         InvalidRevealCommitHashNotMatch,
         /// Attempting to call set_weights when commit/reveal is enabled

pallets/subtensor/src/weights.rs

@@ -97,12 +97,13 @@ impl<T: Config> Pallet<T> {
         );
 
         WeightCommits::<T>::try_mutate_exists(netuid, &who, |maybe_commit| -> DispatchResult {
-            let (commit_hash, commit_block) =
-                maybe_commit.as_ref().ok_or(Error::<T>::NoCommitFound)?;
+            let (commit_hash, commit_block) = maybe_commit
+                .as_ref()
+                .ok_or(Error::<T>::NoWeightsCommitFound)?;
 
             ensure!(
                 Self::is_reveal_block_range(netuid, *commit_block),
-                Error::<T>::InvalidRevealTempo
+                Error::<T>::InvalidRevealCommitTempo
             );
 
             let provided_hash: H256 = BlakeTwo256::hash_of(&(
@@ -113,7 +114,10 @@ impl<T: Config> Pallet<T> {
                 salt.clone(),
                 version_key,
             ));
-            ensure!(provided_hash == *commit_hash, Error::<T>::InvalidReveal);
+            ensure!(
+                provided_hash == *commit_hash,
+                Error::<T>::InvalidRevealCommitHashNotMatch
+            );
 
             Self::do_set_weights(origin, netuid, uids, values, version_key)
         })

pallets/subtensor/tests/weights.rs

@@ -1158,7 +1158,7 @@ fn test_commit_reveal_interval() {
                 salt.clone(),
                 version_key,
             ),
-            Error::<Test>::InvalidRevealCommitHashNotMatchTempo
+            Error::<Test>::InvalidRevealCommitTempo
         );
         step_block(99);
         assert_err!(
@@ -1174,7 +1174,7 @@ fn test_commit_reveal_interval() {
                 salt.clone(),
                 version_key,
             ),
-            Error::<Test>::InvalidRevealCommitHashNotMatchTempo
+            Error::<Test>::InvalidRevealCommitTempo
         );
         step_block(1);
         assert_ok!(SubtensorModule::reveal_weights(
@@ -1199,7 +1199,7 @@ fn test_commit_reveal_interval() {
                 salt.clone(),
                 version_key,
             ),
-            Error::<Test>::InvalidRevealCommitHashNotMatchTempo
+            Error::<Test>::InvalidRevealCommitTempo
         );
         step_block(100);
         assert_ok!(SubtensorModule::reveal_weights(
@@ -1227,7 +1227,7 @@ fn test_commit_reveal_interval() {
                 salt.clone(),
                 version_key,
             ),
-            Error::<Test>::InvalidRevealCommitHashNotMatchTempo
+            Error::<Test>::InvalidRevealCommitTempo
         );
 
         // Testing when you commit but do not reveal until later intervals
@@ -1584,7 +1584,7 @@ fn test_commit_reveal_bad_salt_fail() {
                 bad_salt.clone(),
                 version_key,
             ),
-            Error::<Test>::InvalidReveal
+            Error::<Test>::InvalidRevealCommitHashNotMatch
         );
     });
 }