Skip to content

Commit e8c911c

Browse files
ValuedMammalevanlinjin
authored andcommitted
chore: update rust-version to 1.86.0
Clippy was complaining about overindented list items, so fix that here as well.
1 parent b9e4e4c commit e8c911c

File tree

3 files changed

+32
-34
lines changed

3 files changed

+32
-34
lines changed

crates/chain/src/tx_graph.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@
2323
//!
2424
//! * [`list_canonical_txs`](TxGraph::list_canonical_txs) lists canonical transactions.
2525
//! * [`filter_chain_txouts`](TxGraph::filter_chain_txouts) filters out canonical outputs from a
26-
//! list of outpoints.
26+
//! list of outpoints.
2727
//! * [`filter_chain_unspents`](TxGraph::filter_chain_unspents) filters out canonical unspent
28-
//! outputs from a list of outpoints.
28+
//! outputs from a list of outpoints.
2929
//! * [`balance`](TxGraph::balance) gets the total sum of unspent outputs filtered from a list of
30-
//! outpoints.
30+
//! outpoints.
3131
//! * [`canonical_iter`](TxGraph::canonical_iter) returns the [`CanonicalIter`] which contains all
32-
//! of the canonicalization logic.
32+
//! of the canonicalization logic.
3333
//!
3434
//! All these methods require a `chain` and `chain_tip` argument. The `chain` must be a
3535
//! [`ChainOracle`] implementation (such as [`LocalChain`](crate::local_chain::LocalChain)) which
@@ -39,17 +39,17 @@
3939
//! transactions have precedence over others:
4040
//!
4141
//! * [`Anchor`] - This bit of data represents that a transaction is anchored in a given block. If
42-
//! the transaction is anchored in chain of `chain_tip`, or is an ancestor of a transaction
43-
//! anchored in chain of `chain_tip`, then the transaction must be canonical.
42+
//! the transaction is anchored in chain of `chain_tip`, or is an ancestor of a transaction
43+
//! anchored in chain of `chain_tip`, then the transaction must be canonical.
4444
//! * `last_seen` - This is the timestamp of when a transaction is last-seen in the mempool. This
45-
//! value is updated by [`insert_seen_at`](TxGraph::insert_seen_at) and
46-
//! [`apply_update`](TxGraph::apply_update). Transactions that are seen later have higher
47-
//! priority than those that are seen earlier. `last_seen` values are transitive. This means
48-
//! that the actual `last_seen` value of a transaction is the max of all the `last_seen` values
49-
//! from it's descendants.
45+
//! value is updated by [`insert_seen_at`](TxGraph::insert_seen_at) and
46+
//! [`apply_update`](TxGraph::apply_update). Transactions that are seen later have higher
47+
//! priority than those that are seen earlier. `last_seen` values are transitive. This means
48+
//! that the actual `last_seen` value of a transaction is the max of all the `last_seen` values
49+
//! from it's descendants.
5050
//! * `last_evicted` - This is the timestamp of when a transaction last went missing from the
51-
//! mempool. If this value is equal to or higher than the transaction's `last_seen` value, then
52-
//! it will not be considered canonical.
51+
//! mempool. If this value is equal to or higher than the transaction's `last_seen` value, then
52+
//! it will not be considered canonical.
5353
//!
5454
//! # Graph traversal
5555
//!
@@ -490,7 +490,7 @@ impl<A: Clone + Ord> TxGraph<A> {
490490
/// The supplied closure takes in two inputs `(depth, ancestor_tx)`:
491491
///
492492
/// * `depth` is the distance between the starting `Transaction` and the `ancestor_tx`. I.e., if
493-
/// the `Transaction` is spending an output of the `ancestor_tx` then `depth` will be 1.
493+
/// the `Transaction` is spending an output of the `ancestor_tx` then `depth` will be 1.
494494
/// * `ancestor_tx` is the `Transaction`'s ancestor which we are considering to walk.
495495
///
496496
/// The supplied closure returns an `Option<T>`, allowing the caller to map each `Transaction`
@@ -508,7 +508,7 @@ impl<A: Clone + Ord> TxGraph<A> {
508508
/// The supplied closure takes in two inputs `(depth, descendant_txid)`:
509509
///
510510
/// * `depth` is the distance between the starting `txid` and the `descendant_txid`. I.e., if the
511-
/// descendant is spending an output of the starting `txid` then `depth` will be 1.
511+
/// descendant is spending an output of the starting `txid` then `depth` will be 1.
512512
/// * `descendant_txid` is the descendant's txid which we are considering to walk.
513513
///
514514
/// The supplied closure returns an `Option<T>`, allowing the caller to map each node it visits
@@ -648,7 +648,7 @@ impl<A: Anchor> TxGraph<A> {
648648
/// * A non-empty witness has precedence over an empty witness.
649649
/// * A smaller witness has precedence over a larger witness.
650650
/// * If the witness sizes are the same, we prioritize the two witnesses with lexicographical
651-
/// order.
651+
/// order.
652652
pub fn insert_tx<T: Into<Arc<Transaction>>>(&mut self, tx: T) -> ChangeSet<A> {
653653
// This returns `Some` only if the merged tx is different to the `original_tx`.
654654
fn _merge_tx_witnesses(

crates/electrum/src/bdk_electrum_client.rs

+15-17
Original file line numberDiff line numberDiff line change
@@ -102,18 +102,17 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
102102
/// returns updates for [`bdk_chain`] data structures.
103103
///
104104
/// - `request`: struct with data required to perform a spk-based blockchain client full scan,
105-
/// see [`FullScanRequest`].
105+
/// see [`FullScanRequest`].
106106
/// - `stop_gap`: the full scan for each keychain stops after a gap of script pubkeys with no
107-
/// associated transactions.
107+
/// associated transactions.
108108
/// - `batch_size`: specifies the max number of script pubkeys to request for in a single batch
109-
/// request.
109+
/// request.
110110
/// - `fetch_prev_txouts`: specifies whether we want previous `TxOut`s for fee calculation.
111-
/// Note that this requires additional calls to the Electrum server, but
112-
/// is necessary for calculating the fee on a transaction if your wallet
113-
/// does not own the inputs. Methods like [`Wallet.calculate_fee`] and
114-
/// [`Wallet.calculate_fee_rate`] will return a
115-
/// [`CalculateFeeError::MissingTxOut`] error if those `TxOut`s are not
116-
/// present in the transaction graph.
111+
/// Note that this requires additional calls to the Electrum server, but is necessary for
112+
/// calculating the fee on a transaction if your wallet does not own the inputs. Methods like
113+
/// [`Wallet.calculate_fee`] and [`Wallet.calculate_fee_rate`] will return a
114+
/// [`CalculateFeeError::MissingTxOut`] error if those `TxOut`s are not present in the
115+
/// transaction graph.
117116
///
118117
/// [`bdk_chain`]: ../bdk_chain/index.html
119118
/// [`CalculateFeeError::MissingTxOut`]: ../bdk_chain/tx_graph/enum.CalculateFeeError.html#variant.MissingTxOut
@@ -172,16 +171,15 @@ impl<E: ElectrumApi> BdkElectrumClient<E> {
172171
/// and returns updates for [`bdk_chain`] data structures.
173172
///
174173
/// - `request`: struct with data required to perform a spk-based blockchain client sync,
175-
/// see [`SyncRequest`]
174+
/// see [`SyncRequest`]
176175
/// - `batch_size`: specifies the max number of script pubkeys to request for in a single batch
177-
/// request
176+
/// request
178177
/// - `fetch_prev_txouts`: specifies whether we want previous `TxOut`s for fee calculation.
179-
/// Note that this requires additional calls to the Electrum server, but
180-
/// is necessary for calculating the fee on a transaction if your wallet
181-
/// does not own the inputs. Methods like [`Wallet.calculate_fee`] and
182-
/// [`Wallet.calculate_fee_rate`] will return a
183-
/// [`CalculateFeeError::MissingTxOut`] error if those `TxOut`s are not
184-
/// present in the transaction graph.
178+
/// Note that this requires additional calls to the Electrum server, but is necessary for
179+
/// calculating the fee on a transaction if your wallet does not own the inputs. Methods like
180+
/// [`Wallet.calculate_fee`] and [`Wallet.calculate_fee_rate`] will return a
181+
/// [`CalculateFeeError::MissingTxOut`] error if those `TxOut`s are not present in the
182+
/// transaction graph.
185183
///
186184
/// If the scripts to sync are unknown, such as when restoring or importing a keychain that
187185
/// may include scripts that have been used, use [`full_scan`] with the keychain.

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.85.0
1+
1.86.0

0 commit comments

Comments
 (0)