Skip to content

Commit 93eafc3

Browse files
keyless/immutable test generalization
1 parent 59d96a8 commit 93eafc3

10 files changed

Lines changed: 2359 additions & 2055 deletions

File tree

storage/src/qmdb/current/db.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -397,14 +397,15 @@ where
397397
/// Prunes historical operations prior to `prune_loc`. This does not affect the db's root or
398398
/// snapshot.
399399
///
400-
/// Pruning is clipped to the settled bitmap boundary (see [`Db::sync_boundary`]): the ops
401-
/// log's lower bound is never advanced past where the grafting overlay has been pruned. The
402-
/// bitmap and grafted tree advance to that same settled boundary regardless of `prune_loc`.
400+
/// Pruning is clipped to the settled bitmap boundary (see [`Db::sync_boundary`]): the ops log's
401+
/// lower bound is never advanced past where the grafting overlay has been pruned. The bitmap
402+
/// and grafted tree advance to that same settled boundary regardless of `prune_loc`.
403403
///
404404
/// # Errors
405405
///
406406
/// - Returns [Error::PruneBeyondMinRequired] if `prune_loc` > inactivity floor.
407-
/// - Returns [`crate::merkle::Error::LocationOverflow`] if `prune_loc` > [crate::merkle::Family::MAX_LEAVES].
407+
/// - Returns [`crate::merkle::Error::LocationOverflow`] if `prune_loc` >
408+
/// [crate::merkle::Family::MAX_LEAVES].
408409
pub async fn prune(&mut self, prune_loc: Location<F>) -> Result<(), Error<F>> {
409410
let inactivity_floor = self.inactivity_floor_loc();
410411
if prune_loc > inactivity_floor {

storage/src/qmdb/current/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1820,10 +1820,10 @@ pub mod tests {
18201820
});
18211821
}
18221822

1823-
/// Verify that on a non-delayed-merge (MMR) family `pruning_boundary()` lags the
1824-
/// inactivity floor only by chunk alignment (less than one chunk) — never by a
1825-
/// delayed-merge absorption window. Guards against an accidental regression that
1826-
/// would introduce a larger lag on families that don't need it.
1823+
/// Verify that on a non-delayed-merge (MMR) family `pruning_boundary()` lags the inactivity
1824+
/// floor only by chunk alignment (less than one chunk) — never by a delayed-merge absorption
1825+
/// window. Guards against an accidental regression that would introduce a larger lag on
1826+
/// families that don't need it.
18271827
#[test_traced]
18281828
fn test_current_mmr_prune_boundary_lag_is_only_chunk_alignment() {
18291829
let executor = deterministic::Runner::default();
@@ -1867,9 +1867,8 @@ pub mod tests {
18671867
});
18681868
}
18691869

1870-
/// Verify that `prune(loc)` with `loc < pruning_boundary()` prunes the ops journal only
1871-
/// as far as the caller requested. The clip must pick the smaller of the two — it must
1872-
/// not over-prune when the caller asked for less than the settled boundary.
1870+
/// Verify that `prune(loc)` with `loc < pruning_boundary()` prunes the ops journal only as far
1871+
/// as the caller requested.
18731872
#[test_traced]
18741873
fn test_current_prune_below_settled_boundary_is_honored() {
18751874
let executor = deterministic::Runner::default();

0 commit comments

Comments
 (0)