fixes

dashpay · Sep 30, 2024 · 8d55bf6 · 8d55bf6
1 parent 604117e
commit 8d55bf6
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 11 deletions.
diff --git a/packages/rs-drive-abci/tests/strategy_tests/withdrawal_tests.rs b/packages/rs-drive-abci/tests/strategy_tests/withdrawal_tests.rs
@@ -790,15 +790,13 @@ mod tests {
             .expect_send_raw_transaction()
             .returning(move |_| Ok(Txid::all_zeros()));
 
-        let mut chain_locked_height = 1;
-
         // Have to go with a complicated shared object for the core state because we need to change
         // rpc response along the way but we can't mutate `platform.core_rpc` later
         // because platform reference is moved into the AbciApplication.
         let shared_core_state = Arc::new(Mutex::new(CoreState {
             asset_unlock_statuses: BTreeMap::new(),
             chain_lock: ChainLock {
-                block_height: chain_locked_height,
+                block_height: 1,
                 block_hash: BlockHash::from_byte_array([1; 32]),
                 signature: BLSSignature::from([2; 96]),
             },

diff --git a/...saction/queue/move_broadcasted_withdrawal_transactions_back_to_queue_operations/v0/mod.rs b/...saction/queue/move_broadcasted_withdrawal_transactions_back_to_queue_operations/v0/mod.rs
@@ -10,6 +10,11 @@ impl Drive {
         drive_operation_types: &mut Vec<DriveOperation>,
     ) {
         if !indexes.is_empty() {
+            tracing::trace!(
+                "Moving {} broadcasted withdrawal transactions back to the queue for resigning: {:?}",
+                indexes.len(),
+                indexes
+            );
             drive_operation_types.push(DriveOperation::WithdrawalOperation(
                 WithdrawalOperationType::MoveBroadcastedWithdrawalTransactionsBackToQueueForResigning {
                     indexes,

diff --git a/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/mod.rs
@@ -4,7 +4,7 @@ use crate::drive::Drive;
 use crate::error::drive::DriveError;
 use crate::error::Error;
 use crate::fees::op::LowLevelDriveOperation;
-use crate::util::grove_operations::{BatchDeleteApplyType, BatchMoveApplyType};
+use crate::util::grove_operations::BatchMoveApplyType;
 
 use dpp::version::drive_versions::DriveVersion;
 
@@ -37,7 +37,7 @@ impl Drive {
         match drive_version
             .grove_methods
             .batch
-            .batch_delete_items_in_path_query
+            .batch_move_items_in_path_query
         {
             0 => self.batch_move_items_in_path_query_v0(
                 path_query,

diff --git a/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/v0/mod.rs b/packages/rs-drive/src/util/grove_operations/batch_move_items_in_path_query/v0/mod.rs
@@ -39,9 +39,9 @@ impl Drive {
         drive_version: &DriveVersion,
     ) -> Result<(), Error> {
         if path_query.query.limit == None {
-            Error::Drive(DriveError::NotSupported(
+            return Err(Error::Drive(DriveError::NotSupported(
                 "Limits are required for path_query",
-            ));
+            )));
         }
         let query_result = if path_query
             .query

diff --git a/packages/rs-drive/src/util/grove_operations/mod.rs b/packages/rs-drive/src/util/grove_operations/mod.rs
@@ -180,7 +180,7 @@ pub enum BatchDeleteApplyType {
     StatelessBatchDelete {
         /// Are we deleting in a sum tree
         is_sum_tree: bool,
-        /// What is the estimated value size
+        /// What is the estimated key size
         estimated_key_size: u32,
         /// What is the estimated value size
         estimated_value_size: u32,
@@ -197,11 +197,11 @@ pub enum BatchDeleteApplyType {
 pub enum BatchMoveApplyType {
     /// Stateless batch move
     StatelessBatchMove {
-        /// Does this tree use sums?
+        /// Are we moving from inside a sum tree
         in_tree_using_sums: bool,
-        /// Are we deleting in a sum tree
+        /// Are we moving a sum tree
         is_sum_tree: bool,
-        /// What is the estimated value size
+        /// What is the estimated key size
         estimated_key_size: u32,
         /// What is the estimated value size
         estimated_value_size: u32,

diff --git a/packages/rs-platform-version/src/version/drive_versions.rs b/packages/rs-platform-version/src/version/drive_versions.rs
@@ -462,6 +462,7 @@ pub struct DriveGroveBatchMethodVersions {
     pub batch_replace: FeatureVersion,
     pub batch_delete: FeatureVersion,
     pub batch_delete_items_in_path_query: FeatureVersion,
+    pub batch_move_items_in_path_query: FeatureVersion,
     pub batch_remove_raw: FeatureVersion,
     pub batch_delete_up_tree_while_empty: FeatureVersion,
     pub batch_refresh_reference: FeatureVersion,