From 6088fffc0943b133b725d8bae02647c2cf1d1659 Mon Sep 17 00:00:00 2001 From: Matt Corallo Date: Mon, 21 Aug 2023 04:03:37 +0000 Subject: [PATCH] Drop MSRV to 1.63 Debian bookworm ships with 1.63, and since the change is trivial, there's little reason to not support people running mempool on Debian. --- .github/workflows/ci.yml | 4 ++-- backend/rust-gbt/src/gbt.rs | 14 ++++++++------ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6b9b1594b..b99454097 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,8 @@ jobs: node-version: ${{ matrix.node }} registry-url: "https://registry.npmjs.org" - - name: Install 1.70.x Rust toolchain - uses: dtolnay/rust-toolchain@1.70 + - name: Install 1.63.x Rust toolchain + uses: dtolnay/rust-toolchain@1.63 - name: Install if: ${{ matrix.flavor == 'dev'}} diff --git a/backend/rust-gbt/src/gbt.rs b/backend/rust-gbt/src/gbt.rs index 0bf7f9999..fb28dc299 100644 --- a/backend/rust-gbt/src/gbt.rs +++ b/backend/rust-gbt/src/gbt.rs @@ -335,13 +335,15 @@ fn set_relatives(txid: u32, audit_pool: &mut AuditPool) { let mut total_sigops: u32 = 0; for ancestor_id in &ancestors { - let Some(ancestor) = audit_pool + if let Some(ancestor) = audit_pool .get(*ancestor_id as usize) - .expect("audit_pool contains all ancestors") else { todo!() }; - total_fee += ancestor.fee; - total_sigop_adjusted_weight += ancestor.sigop_adjusted_weight; - total_sigop_adjusted_vsize += ancestor.sigop_adjusted_vsize; - total_sigops += ancestor.sigops; + .expect("audit_pool contains all ancestors") + { + total_fee += ancestor.fee; + total_sigop_adjusted_weight += ancestor.sigop_adjusted_weight; + total_sigop_adjusted_vsize += ancestor.sigop_adjusted_vsize; + total_sigops += ancestor.sigops; + } else { todo!() }; } if let Some(Some(tx)) = audit_pool.get_mut(txid as usize) {