Skip to content

Commit 6ebdd19

Browse files
Merge #1164: ref(chain): Rename direct_conflicts_of_tx to direct_conflitcs
d5c87c4 ref(chain): Rename direct_conflicts_of_tx to... ...direct_conflitcs (Daniela Brozzoni) 009408d ci: Pin jobserver to 0.1.26 to keep MSRV (Daniela Brozzoni) Pull request description: Fixes #1138 ### Changelog notice - rename `TxGraph::direct_conflicts_of_tx` to `TxGraph::direct_conflicts` ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing ACKs for top commit: evanlinjin: ACK d5c87c4 Tree-SHA512: 10072c65025d5fcc5d90c61ecba1dad53bcd10929326ab18ddadb21322841203aa5861adc9c5f200bbc57b0fe59dd4859dc3672870a0ad343fd8a660fd8aa40e
2 parents 38d69c9 + d5c87c4 commit 6ebdd19

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

.github/workflows/cont_integration.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ jobs:
4646
cargo update -p cc --precise "1.0.81"
4747
cargo update -p byteorder --precise "1.4.3"
4848
cargo update -p webpki --precise "0.22.2"
49+
cargo update -p jobserver --precise "0.1.26"
4950
- name: Build
5051
run: cargo build ${{ matrix.features }}
5152
- name: Test

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ cargo update -p cc --precise "1.0.81"
9797
cargo update -p byteorder --precise "1.4.3"
9898
# webpki 0.22.4 requires `ring:0.17.2` which has MSRV 1.61.0+
9999
cargo update -p webpki --precise "0.22.2"
100+
# jobserver 0.1.27 has MSRV 1.66.0+
101+
cargo update -p jobserver --precise "0.1.26"
100102
```
101103

102104
## License

crates/chain/src/tx_graph.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ impl<A> TxGraph<A> {
373373
where
374374
F: FnMut(usize, Txid) -> Option<O> + 'g,
375375
{
376-
let txids = self.direct_conflicts_of_tx(tx).map(|(_, txid)| txid);
376+
let txids = self.direct_conflitcs(tx).map(|(_, txid)| txid);
377377
TxDescendants::from_multiple_include_root(self, txids, walk_map)
378378
}
379379

@@ -384,7 +384,7 @@ impl<A> TxGraph<A> {
384384
/// Note that this only returns directly conflicting txids and won't include:
385385
/// - descendants of conflicting transactions (which are technically also conflicting)
386386
/// - transactions conflicting with the given transaction's ancestors
387-
pub fn direct_conflicts_of_tx<'g>(
387+
pub fn direct_conflitcs<'g>(
388388
&'g self,
389389
tx: &'g Transaction,
390390
) -> impl Iterator<Item = (usize, Txid)> + '_ {

0 commit comments

Comments
 (0)