diff --git a/packages/rs-drive/src/drive/grove_operations/grove_get_proved_path_query/mod.rs b/packages/rs-drive/src/drive/grove_operations/grove_get_proved_path_query/mod.rs index 7f27c77c541..3dce3a37de3 100644 --- a/packages/rs-drive/src/drive/grove_operations/grove_get_proved_path_query/mod.rs +++ b/packages/rs-drive/src/drive/grove_operations/grove_get_proved_path_query/mod.rs @@ -36,11 +36,7 @@ impl Drive { .basic .grove_get_proved_path_query { - 0 => self.grove_get_proved_path_query_v0( - path_query, - transaction, - drive_operations, - ), + 0 => self.grove_get_proved_path_query_v0(path_query, transaction, drive_operations), version => Err(Error::Drive(DriveError::UnknownVersionMismatch { method: "grove_get_proved_path_query".to_string(), known_versions: vec![0], diff --git a/packages/rs-drive/src/drive/identity/balance/prove.rs b/packages/rs-drive/src/drive/identity/balance/prove.rs index 86e5341f756..01687fb840d 100644 --- a/packages/rs-drive/src/drive/identity/balance/prove.rs +++ b/packages/rs-drive/src/drive/identity/balance/prove.rs @@ -14,12 +14,7 @@ impl Drive { drive_version: &DriveVersion, ) -> Result, Error> { let balance_query = Self::balance_for_identity_id_query(identity_id); - self.grove_get_proved_path_query( - &balance_query, - transaction, - &mut vec![], - drive_version, - ) + self.grove_get_proved_path_query(&balance_query, transaction, &mut vec![], drive_version) } /// Proves an Identity's balance and revision from the backing store @@ -30,12 +25,7 @@ impl Drive { drive_version: &DriveVersion, ) -> Result, Error> { let balance_query = Self::balance_and_revision_for_identity_id_query(identity_id); - self.grove_get_proved_path_query( - &balance_query, - transaction, - &mut vec![], - drive_version, - ) + self.grove_get_proved_path_query(&balance_query, transaction, &mut vec![], drive_version) } /// Proves multiple Identity balances from the backing store @@ -46,12 +36,7 @@ impl Drive { drive_version: &DriveVersion, ) -> Result, Error> { let balance_query = Self::balances_for_identity_ids_query(identity_ids)?; - self.grove_get_proved_path_query( - &balance_query, - transaction, - &mut vec![], - drive_version, - ) + self.grove_get_proved_path_query(&balance_query, transaction, &mut vec![], drive_version) } } diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs index 87a9ea60a88..e46ab86dfce 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identities/v0/mod.rs @@ -14,12 +14,7 @@ impl Drive { ) -> Result, Error> { let mut drive_operations: Vec = vec![]; let query = Self::full_identities_query(identity_ids)?; - self.grove_get_proved_path_query( - &query, - transaction, - &mut drive_operations, - drive_version, - ) + self.grove_get_proved_path_query(&query, transaction, &mut drive_operations, drive_version) } } diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs index b4982cc6703..c42ee914166 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity/v0/mod.rs @@ -14,12 +14,7 @@ impl Drive { ) -> Result, Error> { let mut drive_operations: Vec = vec![]; let query = Self::full_identity_query(&identity_id)?; - self.grove_get_proved_path_query( - &query, - transaction, - &mut drive_operations, - drive_version, - ) + self.grove_get_proved_path_query(&query, transaction, &mut drive_operations, drive_version) } } diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs index bbf83bd981e..0a36d5bd589 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identities_contract_keys/v0/mod.rs @@ -25,11 +25,6 @@ impl Drive { &purposes, Some((identity_ids.len() * purposes.len()) as u16), ); - self.grove_get_proved_path_query( - &query, - transaction, - &mut drive_operations, - drive_version, - ) + self.grove_get_proved_path_query(&query, transaction, &mut drive_operations, drive_version) } } diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs index a3831f9257e..c61469faf3b 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_identity_id_by_unique_public_key_hash/v0/mod.rs @@ -14,12 +14,7 @@ impl Drive { drive_version: &DriveVersion, ) -> Result, Error> { let path_query = Self::identity_id_by_unique_public_key_hash_query(public_key_hash); - self.grove_get_proved_path_query( - &path_query, - transaction, - &mut vec![], - drive_version, - ) + self.grove_get_proved_path_query(&path_query, transaction, &mut vec![], drive_version) } } diff --git a/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs b/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs index ecbbad282bd..7576ceeacef 100644 --- a/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/key/prove/prove_identities_all_keys/v0/mod.rs @@ -36,11 +36,6 @@ impl Drive { drive_version: &DriveVersion, ) -> Result, Error> { let identity_query = Self::fetch_identities_all_keys_query(self, identity_ids, limit)?; - self.grove_get_proved_path_query( - &identity_query, - transaction, - &mut vec![], - drive_version, - ) + self.grove_get_proved_path_query(&identity_query, transaction, &mut vec![], drive_version) } } diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs index 96b1913596a..e21bfcc6e46 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_validator_version_votes/v0/mod.rs @@ -35,11 +35,6 @@ impl Drive { SizedQuery::new(Query::new_single_query_item(query_item), Some(count), None), ); - self.grove_get_proved_path_query( - &path_query, - transaction, - &mut vec![], - drive_version, - ) + self.grove_get_proved_path_query(&path_query, transaction, &mut vec![], drive_version) } } diff --git a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs index 927b835b1e3..5ed6a7d3b83 100644 --- a/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs +++ b/packages/rs-drive/src/drive/protocol_upgrade/fetch_proved_versions_with_counter/v0/mod.rs @@ -18,11 +18,6 @@ impl Drive { versions_counter_path_vec(), Query::new_single_query_item(QueryItem::RangeFull(RangeFull)), ); - self.grove_get_proved_path_query( - &path_query, - transaction, - &mut vec![], - drive_version, - ) + self.grove_get_proved_path_query(&path_query, transaction, &mut vec![], drive_version) } } diff --git a/packages/rs-drive/src/drive/prove/prove_multiple_state_transition_results/v0/mod.rs b/packages/rs-drive/src/drive/prove/prove_multiple_state_transition_results/v0/mod.rs index 5033a06c093..c82e8bc5319 100644 --- a/packages/rs-drive/src/drive/prove/prove_multiple_state_transition_results/v0/mod.rs +++ b/packages/rs-drive/src/drive/prove/prove_multiple_state_transition_results/v0/mod.rs @@ -103,7 +103,7 @@ impl Drive { Some(path_query) })); } - + let path_query = PathQuery::merge(path_queries.iter().collect()).map_err(Error::GroveDB)?; self.grove_get_proved_path_query(