Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion types/src/model/raw_transactions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>>,
}
Expand Down
2 changes: 1 addition & 1 deletion types/src/v21/raw_transactions/into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
})
}
Expand Down
2 changes: 1 addition & 1 deletion types/src/v22/raw_transactions/into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
})
}
Expand Down
6 changes: 3 additions & 3 deletions types/src/v25/raw_transactions/into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
})
Expand Down
2 changes: 1 addition & 1 deletion types/src/v25/raw_transactions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
6 changes: 3 additions & 3 deletions types/src/v29/raw_transactions/into.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
})
})
Expand Down
2 changes: 1 addition & 1 deletion types/src/v29/raw_transactions/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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>,
Expand Down
Loading