fix: trust_peer_addr flaky test; atomic fetch_update -> try_update

crates/rbitcoin-ibd/src/ibd/confirm/mod.rs

@@ -1448,7 +1448,7 @@ impl ConfirmQueueDepths {
     #[doc(hidden)]
     pub fn note_batch_depth_send(depth: &AtomicUsize, hwm: &AtomicUsize) {
         let prev = depth
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
                 Some(n.saturating_add(1))
             })
             .unwrap_or(0);
@@ -1458,7 +1458,7 @@ impl ConfirmQueueDepths {
     #[inline]
     #[doc(hidden)]
     pub fn note_batch_depth_recv(depth: &AtomicUsize) {
-        let _ = depth.fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
+        let _ = depth.try_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
             Some(n.saturating_sub(1))
         });
     }
@@ -1467,16 +1467,16 @@ impl ConfirmQueueDepths {
     pub fn note_load_send(&self, blocks: usize, wire_bytes: usize) {
         let _ = self
             .lookup_to_load
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
                 Some(n.saturating_add(1))
             });
         self.load_blocks
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
                 Some(n.saturating_add(blocks))
             })
             .ok();
         self.load_wire_bytes
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
                 Some(n.saturating_add(wire_bytes))
             })
             .ok();
@@ -1485,12 +1485,12 @@ impl ConfirmQueueDepths {
     pub fn note_load_recv(&self, blocks: usize, wire_bytes: usize) {
         Self::note_batch_depth_recv(&self.lookup_to_load);
         self.load_blocks
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
                 Some(n.saturating_sub(blocks))
             })
             .ok();
         self.load_wire_bytes
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |n| {
                 Some(n.saturating_sub(wire_bytes))
             })
             .ok();
@@ -1603,7 +1603,7 @@ impl ConfirmQueueDepths {
             (wire_bytes, n_wire),
             (parents, n_parents),
         ] {
-            slot.fetch_update(Ordering::Relaxed, Ordering::Relaxed, |cur| Some(op(cur, n)))
+            slot.try_update(Ordering::Relaxed, Ordering::Relaxed, |cur| Some(op(cur, n)))
                 .ok();
         }
     }

crates/rbitcoin-ibd/src/ibd/peer_io.rs

@@ -225,7 +225,7 @@ impl GetdataWire {
         self.written_ms.store(now_ms, Ordering::Relaxed);
         let _ = self
             .unwritten
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |cur| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |cur| {
                 Some(cur.saturating_sub(n))
             });
         self.arm_window_if_closed(now_ms);

crates/rbitcoin-net/src/peers.rs

@@ -907,7 +907,7 @@ impl LivePeer {
     pub fn note_send_written(&self, n: usize) {
         let prev = self
             .send_queued
-            .fetch_update(Ordering::Relaxed, Ordering::Relaxed, |v| {
+            .try_update(Ordering::Relaxed, Ordering::Relaxed, |v| {
                 Some(v.saturating_sub(n))
             })
             .unwrap_or(0);
@@ -930,7 +930,7 @@ impl LivePeer {
     pub fn free_serve_slot(&self) {
         let _ = self
             .serve_inflight
-            .fetch_update(Ordering::SeqCst, Ordering::SeqCst, |v| {
+            .try_update(Ordering::SeqCst, Ordering::SeqCst, |v| {
                 Some(v.saturating_sub(1))
             });
     }

crates/rbitcoin-node/tests/cli.rs

@@ -700,6 +700,11 @@ fn cli_omit_preserves_advanced_env() {
 fn trust_peer_addr() {
     use rbitcoin_node::config::P2pListen;
     use rbitcoin_node::config::DEFAULT_MAX_INBOUND;
+    // `plain` pins the default inbound cap, which `RBITCOIN_P2P_MAX_INBOUND`
+    // overrides; `cli_omit_preserves_advanced_env` sets it under this lock.
+    let _g = OPERATOR_ENV_TEST_LOCK
+        .lock()
+        .unwrap_or_else(|e| e.into_inner());
 
     let h = operator_usage();
     assert!(

crates/rbitcoin-query/src/lib.rs

@@ -1683,22 +1683,20 @@ impl Query {
     /// not advance past it.
     pub fn set_lookup_taken_hi(&self, hi: Option<u32>) {
         let lo = u64::from(hi.unwrap_or(u32::MAX));
-        let _ = self.lookup_taken.fetch_update(
-            AtomicOrdering::AcqRel,
-            AtomicOrdering::Acquire,
-            |cur| {
-                let gen = ((cur >> 32) as u32).wrapping_add(1);
-                Some((u64::from(gen) << 32) | lo)
-            },
-        );
+        let _ =
+            self.lookup_taken
+                .try_update(AtomicOrdering::AcqRel, AtomicOrdering::Acquire, |cur| {
+                    let gen = ((cur >> 32) as u32).wrapping_add(1);
+                    Some((u64::from(gen) << 32) | lo)
+                });
     }
 
     /// Lookup took `hi` off the BQ in a wave selected at generation `gen`.
     /// Returns false, leaving the mark, when a re-arm came in between.
     pub fn advance_lookup_taken_hi(&self, gen: u32, hi: u32) -> bool {
         let next = (u64::from(gen) << 32) | u64::from(hi);
         self.lookup_taken
-            .fetch_update(AtomicOrdering::AcqRel, AtomicOrdering::Acquire, |cur| {
+            .try_update(AtomicOrdering::AcqRel, AtomicOrdering::Acquire, |cur| {
                 ((cur >> 32) as u32 == gen).then_some(next)
             })
             .is_ok()

crates/rbitcoin-store/src/array_table.rs

@@ -28,7 +28,7 @@ use std::sync::{Mutex, RwLock};
 
 /// Packed dirty generation: `0` is clean. `set` bumps; flush CASes back to `0`.
 pub fn dirty_epoch_bump(epoch: &AtomicU64) {
-    let _ = epoch.fetch_update(Ordering::Release, Ordering::Relaxed, |e| {
+    let _ = epoch.try_update(Ordering::Release, Ordering::Relaxed, |e| {
         Some(e.wrapping_add(1).max(1))
     });
 }

crates/rbitcoin-store/src/store.rs

@@ -1754,7 +1754,7 @@ impl Store {
         use std::sync::atomic::Ordering;
         let v = u64::from(height).saturating_add(1);
         self.spend_annotate_from
-            .fetch_update(Ordering::AcqRel, Ordering::Acquire, |cur| {
+            .try_update(Ordering::AcqRel, Ordering::Acquire, |cur| {
                 let cur_h = cur & 0xffff_ffff;
                 let new_h = if cur_h == 0 { v } else { cur_h.min(v) };
                 let mut gen = (cur >> 32).wrapping_add(1);
@@ -1807,7 +1807,7 @@ impl Store {
         }
         let _ = self
             .spend_annotate_from
-            .fetch_update(Ordering::AcqRel, Ordering::Acquire, |cur| {
+            .try_update(Ordering::AcqRel, Ordering::Acquire, |cur| {
                 (cur == token).then_some(0)
             });
     }
@@ -1924,7 +1924,7 @@ impl Store {
         self.spend_reorg_gen.fetch_add(1, Ordering::AcqRel);
         let _ = self
             .spend_snapshot
-            .fetch_update(Ordering::AcqRel, Ordering::Acquire, |cur| {
+            .try_update(Ordering::AcqRel, Ordering::Acquire, |cur| {
                 let low = self
                     .confirmed
                     .tip_height()