Merge branch 'main' into update/polkadot-sdk-1.10.0

pallets/file-system/src/lib.rs

@@ -423,8 +423,7 @@ pub mod pallet {
 
     /// Number of ticks until all BSPs would reach the [`Config::MaximumThreshold`] to ensure that all BSPs are able to volunteer.
     #[pallet::storage]
-    pub type BlockRangeToMaximumThreshold<T: Config> =
-        StorageValue<_, BlockNumberFor<T>, ValueQuery>;
+    pub type TickRangeToMaximumThreshold<T: Config> = StorageValue<_, TickNumber<T>, ValueQuery>;
 
     #[pallet::genesis_config]
     pub struct GenesisConfig<T: Config> {

pallets/file-system/src/tests.rs

@@ -1712,9 +1712,6 @@ mod request_storage {
                 let storage_request_ttl: BlockNumberFor<Test> = storage_request_ttl.into();
                 let expiration_block = System::block_number() + storage_request_ttl;
 
-                // Assert that the next starting block to clean up is set to 0 initially
-                assert_eq!(file_system::NextStartingBlockToCleanUp::<Test>::get(), 0);
-
                 // Assert that the next expiration block number is the storage request ttl since a single storage request was made
                 assert_eq!(
                     file_system::NextAvailableStorageRequestExpirationBlock::<Test>::get(),
@@ -1864,9 +1861,6 @@ mod request_storage {
                 let expected_expiration_block_number: BlockNumberFor<Test> =
                     expected_expiration_block_number.into();
 
-                // Assert that the `NextExpirationInsertionBlockNumber` storage is set to 0 initially
-                assert_eq!(file_system::NextStartingBlockToCleanUp::<Test>::get(), 0);
-
                 // Assert that the storage request expirations storage is at max capacity
                 assert_eq!(
                     file_system::StorageRequestExpirations::<Test>::get(
@@ -1890,9 +1884,6 @@ mod request_storage {
                     max_storage_request_expiry as usize
                 );
 
-                // Assert that the `NextExpirationInsertionBlockNumber` storage did not update
-                assert_eq!(file_system::NextStartingBlockToCleanUp::<Test>::get(), 0);
-
                 // Go to block number after which the storage request expirations should be removed
                 roll_to(expected_expiration_block_number + 1);
 
@@ -2016,9 +2007,6 @@ mod revoke_storage_request {
                 let storage_request_ttl: BlockNumberFor<Test> = storage_request_ttl.into();
                 let expiration_block = System::block_number() + storage_request_ttl;
 
-                // Assert that the NextExpirationInsertionBlockNumber storage is set to 0 initially
-                assert_eq!(file_system::NextStartingBlockToCleanUp::<Test>::get(), 0);
-
                 // Assert that the storage request expiration was appended to the list at `StorageRequestTtl`
                 assert_eq!(
                     file_system::StorageRequestExpirations::<Test>::get(expiration_block),
@@ -2230,7 +2218,9 @@ mod msp_accept_storage_request {
 
                 // Assert that the storage was updated
                 assert_eq!(
-                    file_system::StorageRequests::<Test>::get(file_key).unwrap().msp,
+                    file_system::StorageRequests::<Test>::get(file_key)
+                        .unwrap()
+                        .msp,
                     Some((msp_id, true))
                 );
 
@@ -2329,7 +2319,9 @@ mod msp_accept_storage_request {
 
                 // Assert that the storage was updated
                 assert_eq!(
-                    file_system::StorageRequests::<Test>::get(first_file_key).unwrap().msp,
+                    file_system::StorageRequests::<Test>::get(first_file_key)
+                        .unwrap()
+                        .msp,
                     Some((msp_id, true))
                 );
 
@@ -2366,11 +2358,11 @@ mod msp_accept_storage_request {
                     }
                 ));
 
-				// Assert that the storage was updated
-				assert_eq!(
-					file_system::StorageRequests::<Test>::get(second_file_key).unwrap().msp,
-					Some((msp_id, true))
-				);
+                // Assert that the storage was updated
+                assert_eq!(
+                    FileSystem::storage_requests(second_file_key).unwrap().msp,
+                    Some((msp_id, true))
+                );
 
                 // Get the new root of the bucket.
                 let new_bucket_root = Providers::get_root_bucket(&bucket_id).unwrap();
@@ -2478,7 +2470,9 @@ mod msp_accept_storage_request {
 
                 // Assert that the storage was updated
                 assert_eq!(
-                    file_system::StorageRequests::<Test>::get(first_file_key).unwrap().msp,
+                    file_system::StorageRequests::<Test>::get(first_file_key)
+                        .unwrap()
+                        .msp,
                     Some((msp_id, true))
                 );
 
@@ -2515,11 +2509,11 @@ mod msp_accept_storage_request {
                     }
                 ));
 
-				// Assert that the storage was updated
-				assert_eq!(
-					file_system::StorageRequests::<Test>::get(second_file_key).unwrap().msp,
-					Some((msp_id, true))
-				);
+                // Assert that the storage was updated
+                assert_eq!(
+                    FileSystem::storage_requests(second_file_key).unwrap().msp,
+                    Some((msp_id, true))
+                );
 
                 // Get the new root of the bucket.
                 let new_bucket_root = Providers::get_root_bucket(&second_bucket_id).unwrap();
@@ -2634,7 +2628,9 @@ mod msp_accept_storage_request {
 
                 // Assert that the storage was updated
                 assert_eq!(
-                    file_system::StorageRequests::<Test>::get(first_file_key).unwrap().msp,
+                    file_system::StorageRequests::<Test>::get(first_file_key)
+                        .unwrap()
+                        .msp,
                     Some((msp_id, true))
                 );
 
@@ -2671,11 +2667,11 @@ mod msp_accept_storage_request {
                     }
                 ));
 
-				// Assert that the storage was updated
-				assert_eq!(
-					file_system::StorageRequests::<Test>::get(second_file_key).unwrap().msp,
-					Some((msp_id, true))
-				);
+                // Assert that the storage was updated
+                assert_eq!(
+                    FileSystem::storage_requests(second_file_key).unwrap().msp,
+                    Some((msp_id, true))
+                );
 
                 // Get the new root of the bucket.
                 let new_bucket_root = Providers::get_root_bucket(&second_bucket_id).unwrap();

pallets/proofs-dealer/src/lib.rs

@@ -260,7 +260,7 @@ pub mod pallet {
     /// Those who are still in the entry by the time the tick is reached are considered to
     /// have failed to submit a proof and subject to slashing.
     #[pallet::storage]
-    pub type ChallengeTickToChallengedProviders<T: Config> = StorageDoubleMap<
+    pub type TickToProvidersDeadlines<T: Config> = StorageDoubleMap<
         _,
         Blake2_128Concat,
         BlockNumberFor<T>,