Skip to content

Commit 39ceb11

Browse files
committed
fix merge
1 parent 4c2f899 commit 39ceb11

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

storage/src/qmdb/conformance.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,11 +249,12 @@ macro_rules! apply_sets {
249249
/// Apply a batch of keyless appends to the database.
250250
macro_rules! apply_appends {
251251
($db:ident, $vals:expr) => {{
252+
let floor = $db.inactivity_floor_loc();
252253
let mut batch = $db.new_batch();
253254
for v in $vals {
254255
batch = batch.append(v);
255256
}
256-
let merkleized = batch.merkleize(&$db, None);
257+
let merkleized = batch.merkleize(&$db, None, floor);
257258
$db.apply_batch(merkleized).await.unwrap();
258259
}};
259260
}

0 commit comments

Comments
 (0)