merge conflicts

tari-project · Nov 2, 2023 · ccf9fd6 · ccf9fd6
1 parent 28f009b
commit ccf9fd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/base_layer/core/tests/helpers/sync.rs b/base_layer/core/tests/helpers/sync.rs
@@ -163,7 +163,7 @@ pub enum WhatToDelete {
 // Private helper function to setup a delete a block transaction.
 // Note: This private function will panic if the index is out of bounds - caller function's responsibility.
 fn delete_block(txn: &mut DbTransaction, node: &NodeInterfaces, blocks: &[ChainBlock], index: usize) {
-    txn.delete_block(*blocks[index].hash());
+    txn.delete_tip_block(*blocks[index].hash());
     txn.delete_orphan(*blocks[index].hash());
     txn.set_best_block(
         blocks[index + 1].height(),

diff --git a/base_layer/core/tests/tests/node_state_machine.rs b/base_layer/core/tests/tests/node_state_machine.rs
@@ -187,7 +187,7 @@ async fn test_listening_initial_fallen_behind() {
     let mut prev_block = bob_db
         .prepare_new_block(chain_block(prev_block.block(), vec![], &consensus_manager, &key_manager).await)
         .unwrap();
-    prev_block.header.output_mmr_size += 1;
+    prev_block.header.output_smt_size += 1;
     prev_block.header.kernel_mmr_size += 1;
     bob_local_nci.submit_block(prev_block).await.unwrap();
     assert_eq!(bob_db.get_height().unwrap(), 2);
@@ -210,7 +210,7 @@ async fn test_listening_initial_fallen_behind() {
     let mut prev_block = charlie_db
         .prepare_new_block(chain_block(prev_block.block(), vec![], &consensus_manager, &key_manager).await)
         .unwrap();
-    prev_block.header.output_mmr_size += 1;
+    prev_block.header.output_smt_size += 1;
     prev_block.header.kernel_mmr_size += 1;
     charlie_local_nci.submit_block(prev_block).await.unwrap();
     assert_eq!(charlie_db.get_height().unwrap(), 2);