From 009408d24361235c1d85b7d147983cff7b0fc191 Mon Sep 17 00:00:00 2001
From: Daniela Brozzoni <danielabrozzoni@protonmail.com>
Date: Tue, 10 Oct 2023 16:44:28 +0200
Subject: [PATCH 1/2] ci: Pin jobserver to 0.1.26 to keep MSRV

---
 .github/workflows/cont_integration.yml | 1 +
 README.md                              | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml
index a50156943..4d60f15b9 100644
--- a/.github/workflows/cont_integration.yml
+++ b/.github/workflows/cont_integration.yml
@@ -46,6 +46,7 @@ jobs:
           cargo update -p cc --precise "1.0.81"
           cargo update -p byteorder --precise "1.4.3"
           cargo update -p webpki --precise "0.22.2"
+          cargo update -p jobserver --precise "0.1.26"
       - name: Build
         run: cargo build ${{ matrix.features }}
       - name: Test
diff --git a/README.md b/README.md
index a65aabde0..5e2cec6d5 100644
--- a/README.md
+++ b/README.md
@@ -97,6 +97,8 @@ cargo update -p cc --precise "1.0.81"
 cargo update -p byteorder --precise "1.4.3"
 # webpki 0.22.4 requires `ring:0.17.2` which has MSRV 1.61.0+
 cargo update -p webpki --precise "0.22.2"
+# jobserver 0.1.27 has MSRV 1.66.0+
+cargo update -p jobserver --precise "0.1.26"
 ```
 
 ## License

From d5c87c49a82c5cd3a4558e61fe9984f0ae8c6cb7 Mon Sep 17 00:00:00 2001
From: Daniela Brozzoni <danielabrozzoni@protonmail.com>
Date: Tue, 10 Oct 2023 16:30:48 +0200
Subject: [PATCH 2/2] ref(chain): Rename direct_conflicts_of_tx to...
 ...direct_conflitcs

Fixes #1138
---
 crates/chain/src/tx_graph.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/crates/chain/src/tx_graph.rs b/crates/chain/src/tx_graph.rs
index 698af76c4..1f7bcdb12 100644
--- a/crates/chain/src/tx_graph.rs
+++ b/crates/chain/src/tx_graph.rs
@@ -373,7 +373,7 @@ impl<A> TxGraph<A> {
     where
         F: FnMut(usize, Txid) -> Option<O> + 'g,
     {
-        let txids = self.direct_conflicts_of_tx(tx).map(|(_, txid)| txid);
+        let txids = self.direct_conflitcs(tx).map(|(_, txid)| txid);
         TxDescendants::from_multiple_include_root(self, txids, walk_map)
     }
 
@@ -384,7 +384,7 @@ impl<A> TxGraph<A> {
     /// Note that this only returns directly conflicting txids and won't include:
     /// - descendants of conflicting transactions (which are technically also conflicting)
     /// - transactions conflicting with the given transaction's ancestors
-    pub fn direct_conflicts_of_tx<'g>(
+    pub fn direct_conflitcs<'g>(
         &'g self,
         tx: &'g Transaction,
     ) -> impl Iterator<Item = (usize, Txid)> + '_ {