Merge #535: Change all struct fields *feerate to *fee_rate

3857c7b Change all struct fields *feerate to *fee_rate (Jamil Lambert, PhD)

Pull request description:

  All of the struct fields use *fee_rate except for `effective_feerate`.

  Change `effective_feerate` to `effective_fee_rate` for consistency.

ACKs for top commit:
  tcharding:
    ACK 3857c7b

Tree-SHA512: 7f1efa714ad101a549ef11668b25f23c7dab69b4cb2833f8146c5c15313cf3c94c5674b2f06c6bf8e141fa49e060b0cbc81509cef295f663e2dcfd404053108f

Author: tcharding

types/src/model/raw_transactions.rs

@@ -280,7 +280,7 @@ pub struct MempoolAcceptanceFees {
     pub base: Amount,
     /// The effective feerate in BTC per KvB. May differ from the base feerate if, for example, there
     /// are modified fees from `prioritisetransaction` or a package feerate was used.
-    pub effective_feerate: Option<FeeRate>,
+    pub effective_fee_rate: Option<FeeRate>,
     /// Transactions whose fees and vsizes are included in `effective_feerate`.
     pub effective_includes: Option<Vec<Wtxid>>,
 }

types/src/v21/raw_transactions/into.rs

@@ -26,7 +26,7 @@ impl MempoolAcceptance {
                 let base = Amount::from_btc(s.base).map_err(E::Base)?;
                 Some(model::MempoolAcceptanceFees {
                     base,
-                    effective_feerate: None,  // v25 and later only.
+                    effective_fee_rate: None, // v25 and later only.
                     effective_includes: None, // v25 and later only.
                 })
             }

types/src/v22/raw_transactions/into.rs

@@ -62,7 +62,7 @@ impl MempoolAcceptance {
                 let base = Amount::from_btc(s.base).map_err(E::Base)?;
                 Some(model::MempoolAcceptanceFees {
                     base,
-                    effective_feerate: None,  // v25 and later only.
+                    effective_fee_rate: None, // v25 and later only.
                     effective_includes: None, // v25 and later only.
                 })
             }

types/src/v25/raw_transactions/into.rs

@@ -36,15 +36,15 @@ impl MempoolAcceptance {
                     )
                 };
 
-                let effective_feerate = s
-                    .effective_feerate
+                let effective_fee_rate = s
+                    .effective_fee_rate
                     .map(|f| crate::btc_per_kb(f).map_err(E::Feerate))
                     .transpose()?
                     .flatten();
 
                 Ok::<_, MempoolAcceptanceError>(model::MempoolAcceptanceFees {
                     base: Amount::from_btc(s.base).map_err(E::Base)?,
-                    effective_feerate,
+                    effective_fee_rate,
                     effective_includes,
                 })
             })

types/src/v25/raw_transactions/mod.rs

@@ -57,7 +57,7 @@ pub struct MempoolAcceptanceFees {
     /// The effective feerate in BTC per KvB. May differ from the base feerate if, for example, there
     /// are modified fees from `prioritisetransaction` or a package feerate was used.
     #[serde(rename = "effective-feerate", default)]
-    pub effective_feerate: Option<f64>,
+    pub effective_fee_rate: Option<f64>,
     /// Transactions whose fees and vsizes are included in `effective_feerate`.
     #[serde(rename = "effective-includes", default)]
     pub effective_includes: Vec<String>,

types/src/v29/raw_transactions/into.rs

@@ -36,15 +36,15 @@ impl MempoolAcceptance {
                     )
                 };
 
-                let effective_feerate = s
-                    .effective_feerate
+                let effective_fee_rate = s
+                    .effective_fee_rate
                     .map(|f| crate::btc_per_kb(f).map_err(E::Feerate))
                     .transpose()?
                     .flatten();
 
                 Ok::<_, MempoolAcceptanceError>(model::MempoolAcceptanceFees {
                     base: Amount::from_btc(s.base).map_err(E::Base)?,
-                    effective_feerate,
+                    effective_fee_rate,
                     effective_includes,
                 })
             })

types/src/v29/raw_transactions/mod.rs

@@ -59,7 +59,7 @@ pub struct MempoolAcceptanceFees {
     /// The effective feerate in BTC per KvB. May differ from the base feerate if, for example, there
     /// are modified fees from `prioritisetransaction` or a package feerate was used.
     #[serde(rename = "effective-feerate", default)]
-    pub effective_feerate: Option<f64>,
+    pub effective_fee_rate: Option<f64>,
     /// Transactions whose fees and vsizes are included in `effective_feerate`.
     #[serde(rename = "effective-includes", default)]
     pub effective_includes: Vec<String>,