fix: ⬆️ fix upgrade to polkadot-sdk v1.10.0

client/common/src/types.rs

@@ -11,7 +11,7 @@ use sp_core::Hasher;
 use sp_runtime::{traits::Block as BlockT, KeyTypeId};
 use sp_std::collections::btree_map::BTreeMap;
 use sp_trie::CompactProof;
-use storage_hub_runtime::{opaque::Block, Runtime, RuntimeApi};
+use storage_hub_runtime::{apis::RuntimeApi, opaque::Block, Runtime};
 use trie_db::TrieLayout;
 
 /// The hash type of trie node keys
@@ -48,7 +48,7 @@ pub type KeyProofs = BTreeMap<ForestLeaf, KeyProof>;
 pub type Balance = pallet_storage_providers::types::BalanceOf<Runtime>;
 
 #[cfg(not(feature = "runtime-benchmarks"))]
-type HostFunctions = (cumulus_client_service::ParachainHostFunctions);
+type HostFunctions = cumulus_client_service::ParachainHostFunctions;
 
 #[cfg(feature = "runtime-benchmarks")]
 type HostFunctions = (

pallets/file-system/src/lib.rs

@@ -254,7 +254,6 @@ pub mod pallet {
     pub struct Pallet<T>(_);
 
     #[pallet::storage]
-    #[pallet::getter(fn storage_requests)]
     pub type StorageRequests<T: Config> =
         StorageMap<_, Blake2_128Concat, MerkleHash<T>, StorageRequestMetadata<T>>;
 
@@ -265,7 +264,6 @@ pub mod pallet {
     ///
     /// When a storage request is expired or removed, the corresponding storage request prefix in this map is removed.
     #[pallet::storage]
-    #[pallet::getter(fn storage_request_bsps)]
     pub type StorageRequestBsps<T: Config> = StorageDoubleMap<
         _,
         Blake2_128Concat,
@@ -278,7 +276,6 @@ pub mod pallet {
 
     /// Bookkeeping of the buckets containing open storage requests.
     #[pallet::storage]
-    #[pallet::getter(fn storage_request_buckets)]
     pub type BucketsWithStorageRequests<T: Config> = StorageDoubleMap<
         _,
         Blake2_128Concat,
@@ -291,7 +288,6 @@ pub mod pallet {
 
     /// A map of blocks to expired storage requests.
     #[pallet::storage]
-    #[pallet::getter(fn storage_request_expirations)]
     pub type StorageRequestExpirations<T: Config> = StorageMap<
         _,
         Blake2_128Concat,
@@ -302,7 +298,6 @@ pub mod pallet {
 
     /// A map of blocks to expired file deletion requests.
     #[pallet::storage]
-    #[pallet::getter(fn file_deletion_request_expirations)]
     pub type FileDeletionRequestExpirations<T: Config> = StorageMap<
         _,
         Blake2_128Concat,
@@ -313,7 +308,6 @@ pub mod pallet {
 
     /// A map of blocks to expired move bucket requests.
     #[pallet::storage]
-    #[pallet::getter(fn move_bucket_request_expirations)]
     pub type MoveBucketRequestExpirations<T: Config> = StorageMap<
         _,
         Blake2_128Concat,
@@ -326,23 +320,20 @@ pub mod pallet {
     ///
     /// This should always be greater or equal than current block + [`Config::StorageRequestTtl`].
     #[pallet::storage]
-    #[pallet::getter(fn next_available_storage_request_expiration_block)]
     pub type NextAvailableStorageRequestExpirationBlock<T: Config> =
         StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
     /// A pointer to the earliest available block to insert a new file deletion request expiration.
     ///
     /// This should always be greater or equal than current block + [`Config::PendingFileDeletionRequestTtl`].
     #[pallet::storage]
-    #[pallet::getter(fn next_available_file_deletion_request_expiration_block)]
     pub type NextAvailableFileDeletionRequestExpirationBlock<T: Config> =
         StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
     /// A pointer to the earliest available block to insert a new move bucket request expiration.
     ///
     /// This should always be greater or equal than current block + [`Config::MoveBucketRequestTtl`].
     #[pallet::storage]
-    #[pallet::getter(fn next_available_move_bucket_request_expiration_block)]
     pub type NextAvailableMoveBucketRequestExpirationBlock<T: Config> =
         StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
@@ -352,14 +343,12 @@ pub mod pallet {
     /// attempt to accelerate this block pointer as close to or up to the current block number. This
     /// will execute provided that there is enough remaining weight to do so.
     #[pallet::storage]
-    #[pallet::getter(fn next_starting_block_to_clean_up)]
     pub type NextStartingBlockToCleanUp<T: Config> = StorageValue<_, BlockNumberFor<T>, ValueQuery>;
 
     /// Pending file deletion requests.
     ///
     /// A mapping from a user account id to a list of pending file deletion requests, holding a tuple of the file key and bucket id.
     #[pallet::storage]
-    #[pallet::getter(fn pending_file_deletion_requests)]
     pub type PendingFileDeletionRequests<T: Config> = StorageMap<
         _,
         Blake2_128Concat,
@@ -375,7 +364,6 @@ pub mod pallet {
     /// The block number is used to avoid BSPs being able to stop storing files immediately which would allow them to avoid challenges
     /// of missing files. The size is to be able to decrease their used capacity when they confirm to stop storing the file.
     #[pallet::storage]
-    #[pallet::getter(fn pending_stop_storing_requests)]
     pub type PendingStopStoringRequests<T: Config> = StorageDoubleMap<
         _,
         Blake2_128Concat,
@@ -390,7 +378,6 @@ pub mod pallet {
     /// A double mapping from MSP IDs to a list of bucket IDs which they can accept or decline to take over.
     /// The value is the user who requested the move.
     #[pallet::storage]
-    #[pallet::getter(fn pending_move_bucket_requests)]
     pub type PendingMoveBucketRequests<T: Config> = StorageDoubleMap<
         _,
         Blake2_128Concat,
@@ -402,7 +389,6 @@ pub mod pallet {
 
     /// BSP data servers for move bucket requests.
     #[pallet::storage]
-    #[pallet::getter(fn data_servers_for_move_bucket)]
     pub type DataServersForMoveBucket<T: Config> = StorageDoubleMap<
         _,
         Blake2_128Concat,
@@ -414,20 +400,17 @@ pub mod pallet {
 
     /// Bookkeeping of buckets that are pending to be moved to a new MSP.
     #[pallet::storage]
-    #[pallet::getter(fn pending_buckets_to_move)]
     pub type PendingBucketsToMove<T: Config> =
         StorageMap<_, Blake2_128Concat, BucketIdFor<T>, (), ValueQuery>;
 
     /// Number of BSPs required to fulfill a storage request
     ///
     /// This is also used as a default value if the BSPs required are not specified when creating a storage request.
     #[pallet::storage]
-    #[pallet::getter(fn replication_target)]
     pub type ReplicationTarget<T: Config> = StorageValue<_, ReplicationTargetType<T>, ValueQuery>;
 
     /// Number of blocks until all BSPs would reach the [`Config::MaximumThreshold`] to ensure that all BSPs are able to volunteer.
     #[pallet::storage]
-    #[pallet::getter(fn block_range_to_maximum_threshold)]
     pub type BlockRangeToMaximumThreshold<T: Config> =
         StorageValue<_, BlockNumberFor<T>, ValueQuery>;