rebase fixes

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

@@ -2370,6 +2370,7 @@ impl AuthorityPerEpochStore {
         }
     }
 
+    #[cfg(test)]
     pub fn test_insert_user_signature(
         &self,
         digest: TransactionDigest,
@@ -2390,6 +2391,13 @@ impl AuthorityPerEpochStore {
         self.consensus_notify_read.notify(&key, &());
     }
 
+    #[cfg(test)]
+    pub(crate) fn push_consensus_output_for_tests(&self, output: ConsensusCommitOutput) {
+        self.consensus_quarantine
+            .write()
+            .push_consensus_output(output);
+    }
+
     fn finish_consensus_certificate_process_with_batch(
         &self,
         certificates: &[VerifiedExecutableTransaction],
@@ -4774,7 +4782,6 @@ impl ConsensusCommitOutput {
     }
 
     // in testing code we often need to write to the db outside of a consensus commit
-    #[cfg(test)]
     pub(crate) fn set_default_commit_stats_for_testing(&mut self) {
         self.record_consensus_commit_stats(Default::default());
     }

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

@@ -242,8 +242,6 @@ impl<'a> TestAuthorityBuilder<'a> {
             backpressure_manager.clone(),
         );
 
-        let checkpoint_store = CheckpointStore::new(&path.join("checkpoints"));
-
         let epoch_store = AuthorityPerEpochStore::new(
             name,
             Arc::new(genesis_committee.clone()),

crates/sui-core/src/execution_cache/passthrough_cache.rs

@@ -362,7 +362,7 @@ impl ExecutionCacheCommit for PassthroughCache {
     }
 
     fn persist_transaction(&self, tx: &VerifiedExecutableTransaction) {
-        self.store.persist_transaction(tx)
+        self.store.persist_transaction(tx).expect("db error");
     }
 
     fn approximate_pending_transaction_count(&self) -> u64 {

crates/sui-core/src/execution_cache/writeback_cache.rs

@@ -1276,7 +1276,7 @@ impl ExecutionCacheCommit for WritebackCache {
     }
 
     fn persist_transaction(&self, tx: &VerifiedExecutableTransaction) {
-        self.store.persist_transaction(tx)
+        self.store.persist_transaction(tx).expect("db error");
     }
 
     fn approximate_pending_transaction_count(&self) -> u64 {

crates/sui-node/src/lib.rs

@@ -516,9 +516,6 @@ impl SuiNode {
             )))
         };
 
-        info!("creating checkpoint store");
-        let checkpoint_store = CheckpointStore::new(&config.db_path().join("checkpoints"));
-
         let epoch_options = default_db_options().optimize_db_for_write_throughput(4);
         let epoch_store = AuthorityPerEpochStore::new(
             config.protocol_public_key(),