Renamings, fmt

core-processor/src/ext.rs

@@ -1201,25 +1201,25 @@ impl<LP: LazyPagesInterface> Externalities for Ext<LP> {
     fn unreserve_gas(&mut self, id: ReservationId) -> Result<u64, Self::FallibleError> {
         let (amount, reimburse) = self.context.gas_reserver.unreserve(id)?;
 
-        if let Some(reimburse) = reimburse {
+        if let Some(reimbursement) = reimburse {
             let current_gas_amount = self.gas_amount();
 
             // Basically amount of the reseravtion and the cost for the hold duration.
-            let reimburse_amount = self
+            let reimbursement_amount = self
                 .context
                 .costs
                 .rent
                 .reservation
                 .cost_for(
                     self.context
                         .reserve_for
-                        .saturating_add(reimburse.duration())
+                        .saturating_add(reimbursement.duration())
                         .into(),
                 )
                 .saturating_add(amount);
             self.context
                 .gas_counter
-                .increase(reimburse_amount, reimburse)
+                .increase(reimbursement_amount, reimbursement)
                 .then_some(())
                 .unwrap_or_else(|| {
                     unreachable!(

core/src/gas.rs

@@ -18,7 +18,7 @@
 
 //! Gas module.
 
-use crate::{costs::CostToken, reservation::ReimburseUnreserved};
+use crate::{costs::CostToken, reservation::UnreservedReimbursement};
 use enum_iterator::Sequence;
 use scale_info::{
     scale::{Decode, Encode},
@@ -103,7 +103,7 @@ impl GasCounter {
     ///
     /// Called when gas unreservation is occurred.
     /// We don't decrease `burn` counter because `GasTree` manipulation is handled by separated function
-    pub fn increase(&mut self, amount: u64, _token: ReimburseUnreserved) -> bool {
+    pub fn increase(&mut self, amount: u64, _token: UnreservedReimbursement) -> bool {
         match self.left.checked_add(amount) {
             None => false,
             Some(new_left) => {

core/src/reservation.rs

@@ -211,7 +211,7 @@ impl GasReserver {
     pub fn unreserve(
         &mut self,
         id: ReservationId,
-    ) -> Result<(u64, Option<ReimburseUnreserved>), ReservationError> {
+    ) -> Result<(u64, Option<UnreservedReimbursement>), ReservationError> {
         // Docs error case #1.
         let state = self
             .states
@@ -239,7 +239,7 @@ impl GasReserver {
             }
             GasReservationState::Created {
                 amount, duration, ..
-            } => (amount, Some(ReimburseUnreserved(duration))),
+            } => (amount, Some(UnreservedReimbursement(duration))),
             GasReservationState::Removed { .. } => {
                 let err_msg =
                     "GasReserver::unreserve: `Removed` variant is unreachable, checked above";
@@ -337,9 +337,9 @@ impl GasReserver {
 ///
 /// Wraps duration for the newly created reservation.
 #[derive(Debug, PartialEq, Eq)]
-pub struct ReimburseUnreserved(u32);
+pub struct UnreservedReimbursement(u32);
 
-impl ReimburseUnreserved {
+impl UnreservedReimbursement {
     /// Returns duration for the newly created unreserved reservation.
     pub fn duration(&self) -> u32 {
         self.0