Skip to content

Commit 0adf70d

Browse files
authored
[tidehunter] fix th compilation (#24419)
## Description Describe the changes or additions included in this PR. ## Test plan How did you test the new or updated feature? --- ## Release notes Check each box that your changes affect. If none of the boxes relate to your changes, release notes aren't required. For each box you select, include information after the relevant heading that describes the impact of your changes that a user might notice and any actions they must take to implement updates. - [ ] Protocol: - [ ] Nodes (Validators and Full nodes): - [ ] gRPC: - [ ] JSON-RPC: - [ ] GraphQL: - [ ] CLI: - [ ] Rust SDK: - [ ] Indexing Framework:
1 parent 6ed6780 commit 0adf70d

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

crates/sui-core/src/authority/authority_store_pruner.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use std::sync::{Mutex, Weak};
2323
use std::time::{SystemTime, UNIX_EPOCH};
2424
use std::{sync::Arc, time::Duration};
2525
use sui_config::node::AuthorityStorePruningConfig;
26-
use sui_types::base_types::SequenceNumber;
2726
use sui_types::committee::EpochId;
2827
use sui_types::effects::TransactionEffects;
2928
use sui_types::effects::TransactionEffectsAPI;
@@ -32,7 +31,7 @@ use sui_types::messages_checkpoint::{
3231
CheckpointContents, CheckpointDigest, CheckpointSequenceNumber,
3332
};
3433
use sui_types::{
35-
base_types::{ObjectID, VersionNumber},
34+
base_types::{ObjectID, SequenceNumber, TransactionDigest, VersionNumber},
3635
storage::ObjectKey,
3736
};
3837
use tokio::sync::oneshot::{self, Sender};
@@ -587,7 +586,6 @@ impl AuthorityStorePruner {
587586

588587
let target_epoch = current_epoch - 1;
589588

590-
use sui_types::base_types::TransactionDigest;
591589
let start_key = (0u64, TransactionDigest::ZERO);
592590
let end_key = (target_epoch, TransactionDigest::ZERO);
593591

crates/typed-store/src/rocks/mod.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,12 +397,13 @@ impl Database {
397397
#[cfg(tidehunter)]
398398
pub fn drop_cells_in_range(
399399
&self,
400-
ks: tidehunter::KeySpace,
400+
ks: KeySpace,
401401
from_inclusive: &[u8],
402402
to_inclusive: &[u8],
403403
) -> anyhow::Result<()> {
404404
if let Storage::TideHunter(db) = &self.storage {
405-
db.drop_cells_in_range(ks, from_inclusive, to_inclusive)?;
405+
db.drop_cells_in_range(ks, from_inclusive, to_inclusive)
406+
.map_err(|e| anyhow::anyhow!("{:?}", e))?;
406407
} else {
407408
panic!("drop_cells_in_range called on non-TideHunter storage");
408409
}

0 commit comments

Comments
 (0)