fix: 🎨 implement fixes to PR + run typegen (#316)

Moonsong-Labs · Jan 8, 2025 · 355612f · 355612f
1 parent d6123c3
commit 355612f
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,6 +19,7 @@ runtimes/
 .env
 *.tmp
 **/tmp/
+res/benchmarking
 
 .DS_Store
 .vscode/

diff --git a/api-augment/dist/interfaces/lookup.js b/api-augment/dist/interfaces/lookup.js
diff --git a/api-augment/dist/interfaces/lookup.js.map b/api-augment/dist/interfaces/lookup.js.map
diff --git a/api-augment/dist/types/interfaces/augment-api-errors.d.ts b/api-augment/dist/types/interfaces/augment-api-errors.d.ts
@@ -447,10 +447,6 @@ declare module "@polkadot/api-base/types/errors" {
        * Number of removed BSPs volunteered from storage request prefix did not match the expected number.
        **/
       UnexpectedNumberOfRemovedVolunteeredBsps: AugmentedError<ApiType>;
-      /**
-       * Used Capacity value should be 0.
-       **/
-      UsedCapacityShouldBeZero: AugmentedError<ApiType>;
       /**
        * A SP tried to stop storing files from a user that was supposedly insolvent, but the user is not insolvent.
        **/

diff --git a/api-augment/dist/types/interfaces/types-lookup.d.ts b/api-augment/dist/types/interfaces/types-lookup.d.ts
@@ -5457,7 +5457,6 @@ declare module "@polkadot/types/lookup" {
     readonly isRootNotUpdated: boolean;
     readonly isNoPrivacyChange: boolean;
     readonly isOperationNotAllowedForInsolventProvider: boolean;
-    readonly isUsedCapacityShouldBeZero: boolean;
     readonly type:
       | "StorageRequestAlreadyRegistered"
       | "StorageRequestNotFound"
@@ -5532,8 +5531,7 @@ declare module "@polkadot/types/lookup" {
       | "NoFileKeysToConfirm"
       | "RootNotUpdated"
       | "NoPrivacyChange"
-      | "OperationNotAllowedForInsolventProvider"
-      | "UsedCapacityShouldBeZero";
+      | "OperationNotAllowedForInsolventProvider";
   }
   /** @name PalletProofsDealerProofSubmissionRecord (467) */
   interface PalletProofsDealerProofSubmissionRecord extends Struct {

diff --git a/api-augment/src/interfaces/augment-api-errors.ts b/api-augment/src/interfaces/augment-api-errors.ts
@@ -455,10 +455,6 @@ declare module "@polkadot/api-base/types/errors" {
        * Number of removed BSPs volunteered from storage request prefix did not match the expected number.
        **/
       UnexpectedNumberOfRemovedVolunteeredBsps: AugmentedError<ApiType>;
-      /**
-       * Used Capacity value should be 0.
-       **/
-      UsedCapacityShouldBeZero: AugmentedError<ApiType>;
       /**
        * A SP tried to stop storing files from a user that was supposedly insolvent, but the user is not insolvent.
        **/

diff --git a/api-augment/src/interfaces/lookup.ts b/api-augment/src/interfaces/lookup.ts
@@ -4541,8 +4541,7 @@ export default {
       "NoFileKeysToConfirm",
       "RootNotUpdated",
       "NoPrivacyChange",
-      "OperationNotAllowedForInsolventProvider",
-      "UsedCapacityShouldBeZero"
+      "OperationNotAllowedForInsolventProvider"
     ]
   },
   /**

diff --git a/api-augment/src/interfaces/types-lookup.ts b/api-augment/src/interfaces/types-lookup.ts
@@ -5724,7 +5724,6 @@ declare module "@polkadot/types/lookup" {
     readonly isRootNotUpdated: boolean;
     readonly isNoPrivacyChange: boolean;
     readonly isOperationNotAllowedForInsolventProvider: boolean;
-    readonly isUsedCapacityShouldBeZero: boolean;
     readonly type:
       | "StorageRequestAlreadyRegistered"
       | "StorageRequestNotFound"
@@ -5799,8 +5798,7 @@ declare module "@polkadot/types/lookup" {
       | "NoFileKeysToConfirm"
       | "RootNotUpdated"
       | "NoPrivacyChange"
-      | "OperationNotAllowedForInsolventProvider"
-      | "UsedCapacityShouldBeZero";
+      | "OperationNotAllowedForInsolventProvider";
   }
 
   /** @name PalletProofsDealerProofSubmissionRecord (467) */

diff --git a/api-augment/storagehub.json b/api-augment/storagehub.json
diff --git a/pallets/file-system/src/lib.rs b/pallets/file-system/src/lib.rs
@@ -826,8 +826,6 @@ pub mod pallet {
         NoPrivacyChange,
         /// Operations not allowed for insolvent provider
         OperationNotAllowedForInsolventProvider,
-        /// Used Capacity value should be 0.
-        UsedCapacityShouldBeZero,
     }
 
     /// This enum holds the HoldReasons for this pallet, allowing the runtime to identify each held balance with different reasons separately

diff --git a/pallets/file-system/src/utils.rs b/pallets/file-system/src/utils.rs
@@ -1800,8 +1800,9 @@ where
                 });
             }
 
-            // We should remove the BSP from the dealer proof
+            // Stop the BSP's challenge and randomness cycles.
             <T::ProofDealer as shp_traits::ProofsDealerInterface>::stop_challenge_cycle(&bsp_id)?;
+            <T::CrRandomness as CommitRevealRandomnessInterface>::stop_randomness_cycle(&bsp_id)?;
         };
 
         Ok((bsp_id, new_root))
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,6 +19,7 @@ runtimes/ @@
     .env
     *.tmp
     **/tmp/
+    res/benchmarking
     .DS_Store
     .vscode/
@@ Expand Down @@