From cc9a98b08172499792be13befd2407ac59fb9da9 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 9 Feb 2024 05:24:44 +0700 Subject: [PATCH 1/3] refactor(platform): autogenerated clippy fixes for rust version 1.76 --- .../document_type/methods/mod.rs | 2 +- .../data_contract/document_type/schema/mod.rs | 1 - .../schema/recursive_schema_validator/mod.rs | 6 +-- packages/rs-dpp/src/data_contract/mod.rs | 2 - .../consensus/basic/data_contract/mod.rs | 2 +- .../document_transitions_are_absent_error.rs | 6 +++ ...ty_update_transition_disable_keys_error.rs | 6 +++ ..._identity_update_transition_empty_error.rs | 6 +++ .../src/identity/conversion/cbor/mod.rs | 1 - packages/rs-dpp/src/identity/mod.rs | 3 +- .../state_transition/asset_lock_proof/mod.rs | 2 +- .../data_contract_create_transition/fields.rs | 2 +- .../identity_create_transition/fields.rs | 2 +- .../accessors/v0/mod.rs | 2 +- packages/rs-dpp/src/tests/fixtures/mod.rs | 4 +- .../rs-drive-abci/src/abci/handler/mod.rs | 4 +- .../src/execution/check_tx/v0/mod.rs | 2 +- .../engine/finalize_block_proposal/v0/mod.rs | 7 +--- .../hash_protxhash_with_key_data/v0/mod.rs | 5 +-- .../update_quorum_info/v0/mod.rs | 5 +-- .../core_chain_lock/choose_quorum/mod.rs | 4 +- .../core_chain_lock/choose_quorum/v0/mod.rs | 4 +- .../verify_chain_lock_locally/mod.rs | 1 - .../verify_chain_lock_locally/v0/mod.rs | 8 ++-- .../v0/mod.rs | 6 +-- .../execute_event/v0/mod.rs | 3 +- .../validate_fees_of_event/v0/mod.rs | 6 +-- .../v0/mod.rs | 7 +--- .../src/execution/storage/mod.rs | 3 -- .../types/block_execution_context/v0/mod.rs | 3 +- .../asset_lock/proof/validate/instant/mod.rs | 8 +--- .../proof/verify_is_not_spent/instant/mod.rs | 2 +- .../proof/verify_is_not_spent/mod.rs | 2 +- .../state_transition/processor/v0/mod.rs | 13 +++--- .../triggers/withdrawals/v0/mod.rs | 2 +- .../identity_create/state/v0/mod.rs | 2 +- .../identity_top_up/state/v0/mod.rs | 2 +- .../src/platform_types/commit/v0/mod.rs | 2 +- .../src/platform_types/platform_state/mod.rs | 4 +- .../platform_types/platform_state/v0/mod.rs | 2 +- packages/rs-drive-abci/src/rpc/core.rs | 8 ++-- .../tests/strategy_tests/chain_lock_update.rs | 6 +-- .../tests/strategy_tests/core_update_tests.rs | 3 -- .../tests/strategy_tests/execution.rs | 8 ++-- .../tests/strategy_tests/failures.rs | 5 +-- .../tests/strategy_tests/main.rs | 42 +++++++------------ .../tests/strategy_tests/query.rs | 4 +- .../tests/strategy_tests/strategy.rs | 4 +- .../strategy_tests/upgrade_fork_tests.rs | 1 - .../verify_state_transitions.rs | 2 +- packages/rs-drive-proof-verifier/src/proof.rs | 2 +- .../rs-drive-proof-verifier/src/verify.rs | 2 +- packages/rs-drive/src/drive/balances/mod.rs | 10 ----- .../drive/batch/drive_op_batch/document.rs | 1 - .../batch/drive_op_batch/drive_methods/mod.rs | 3 -- .../drive/contract/estimation_costs/mod.rs | 1 - .../rs-drive/src/drive/contract/prove/mod.rs | 3 -- .../credit_pools/pending_epoch_refunds/mod.rs | 2 - .../rs-drive/src/drive/document/delete/mod.rs | 10 ----- .../drive/document/estimation_costs/mod.rs | 2 - .../drive/document/index_uniqueness/mod.rs | 5 +-- .../rs-drive/src/drive/document/insert/mod.rs | 8 ---- .../v0/mod.rs | 2 +- .../rs-drive/src/drive/document/update/mod.rs | 8 ---- .../rs-drive/src/drive/platform_state/mod.rs | 3 -- .../src/drive/system/protocol_version/mod.rs | 7 ++-- .../store_current_protocol_version.rs | 1 - .../mod.rs | 2 +- .../v0/mod.rs | 2 +- .../mod.rs | 2 +- .../mod.rs | 2 +- .../v0/mod.rs | 2 +- .../mod.rs | 2 - .../v0/mod.rs | 2 - .../mod.rs | 2 - .../v0/mod.rs | 2 - .../mod.rs | 2 - .../v0/mod.rs | 2 - .../mod.rs | 2 - .../v0/mod.rs | 2 - .../mod.rs | 1 - .../v0/mod.rs | 2 +- .../fee_pools/epochs/operations_factory.rs | 2 +- packages/rs-drive/src/query/conditions.rs | 20 ++++----- packages/rs-drive/src/query/mod.rs | 10 ++--- packages/rs-drive/src/query/ordering.rs | 2 +- packages/rs-drive/src/query/test_index.rs | 2 +- .../src/converter/serde_json.rs | 2 +- .../src/value_serialization/de.rs | 2 +- packages/strategy-tests/src/lib.rs | 14 +------ 90 files changed, 132 insertions(+), 258 deletions(-) diff --git a/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs b/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs index 337128e099d..576d8213488 100644 --- a/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/methods/mod.rs @@ -188,7 +188,7 @@ impl DocumentTypeV0Methods for DocumentTypeV0 { fn top_level_indices(&self) -> Vec<&IndexProperty> { let mut index_properties: Vec<&IndexProperty> = Vec::with_capacity(self.indices.len()); for index in &self.indices { - if let Some(property) = index.properties.get(0) { + if let Some(property) = index.properties.first() { index_properties.push(property); } } diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/mod.rs index 7016579b690..6e739dfc491 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/mod.rs @@ -2,7 +2,6 @@ mod enrich_with_base_schema; pub use enrich_with_base_schema::*; mod find_identifier_and_binary_paths; -pub use find_identifier_and_binary_paths::*; #[cfg(feature = "validation")] mod recursive_schema_validator; diff --git a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs index 15a5377cd91..4a550196fa4 100644 --- a/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs +++ b/packages/rs-dpp/src/data_contract/document_type/schema/recursive_schema_validator/mod.rs @@ -105,7 +105,7 @@ mod test { PlatformVersion::first(), ) .expect("expected traversal validator to succeed"); - let consensus_error = result.errors.get(0).expect("the error should be returned"); + let consensus_error = result.errors.first().expect("the error should be returned"); match consensus_error { ConsensusError::BasicError(BasicError::IncompatibleRe2PatternError(err)) => { @@ -145,7 +145,7 @@ mod test { PlatformVersion::first(), ) .expect("expected traversal validator to exist for first protocol version"); - let consensus_error = result.errors.get(0).expect("the error should be returned"); + let consensus_error = result.errors.first().expect("the error should be returned"); match consensus_error { ConsensusError::BasicError(BasicError::IncompatibleRe2PatternError(err)) => { @@ -175,7 +175,7 @@ mod test { PlatformVersion::first(), ) .expect("expected traversal validator to exist for first protocol version"); - let consensus_error = result.errors.get(0).expect("the error should be returned"); + let consensus_error = result.errors.first().expect("the error should be returned"); match consensus_error { ConsensusError::BasicError(BasicError::IncompatibleRe2PatternError(err)) => { diff --git a/packages/rs-dpp/src/data_contract/mod.rs b/packages/rs-dpp/src/data_contract/mod.rs index d6572b53db6..e3923858f4a 100644 --- a/packages/rs-dpp/src/data_contract/mod.rs +++ b/packages/rs-dpp/src/data_contract/mod.rs @@ -4,11 +4,9 @@ use crate::serialization::{ PlatformLimitDeserializableFromVersionedStructure, PlatformSerializableWithPlatformVersion, }; -pub use data_contract::*; use derive_more::From; use bincode::config::{BigEndian, Configuration}; -pub use generate_data_contract::*; pub mod errors; pub mod extra; diff --git a/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs b/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs index 8c76d586b50..9d90ec16fbb 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/data_contract/mod.rs @@ -31,7 +31,7 @@ pub use invalid_data_contract_version_error::*; pub use invalid_index_property_type_error::*; pub use invalid_indexed_property_constraint_error::*; pub use invalid_json_schema_ref_error::*; -pub use invalid_json_schema_ref_error::*; + pub use system_property_index_already_present_error::*; pub use undefined_index_property_error::*; pub use unique_indices_limit_reached_error::*; diff --git a/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs b/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs index 932c01d4c48..854a530cb31 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/document/document_transitions_are_absent_error.rs @@ -13,6 +13,12 @@ use thiserror::Error; #[platform_serialize(unversioned)] pub struct DocumentTransitionsAreAbsentError {} +impl Default for DocumentTransitionsAreAbsentError { + fn default() -> Self { + Self::new() + } +} + impl DocumentTransitionsAreAbsentError { pub fn new() -> Self { Self {} diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs index dc6fa9e9c82..81bff1d14a2 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_disable_keys_error.rs @@ -14,6 +14,12 @@ use bincode::{Decode, Encode}; #[platform_serialize(unversioned)] pub struct InvalidIdentityUpdateTransitionDisableKeysError; +impl Default for InvalidIdentityUpdateTransitionDisableKeysError { + fn default() -> Self { + Self::new() + } +} + impl InvalidIdentityUpdateTransitionDisableKeysError { pub fn new() -> Self { Self {} diff --git a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs index a553800f600..03048789878 100644 --- a/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs +++ b/packages/rs-dpp/src/errors/consensus/basic/identity/invalid_identity_update_transition_empty_error.rs @@ -14,6 +14,12 @@ use bincode::{Decode, Encode}; #[platform_serialize(unversioned)] pub struct InvalidIdentityUpdateTransitionEmptyError; +impl Default for InvalidIdentityUpdateTransitionEmptyError { + fn default() -> Self { + Self::new() + } +} + impl InvalidIdentityUpdateTransitionEmptyError { pub fn new() -> Self { Self {} diff --git a/packages/rs-dpp/src/identity/conversion/cbor/mod.rs b/packages/rs-dpp/src/identity/conversion/cbor/mod.rs index c0000c8b0d4..e084dffc38f 100644 --- a/packages/rs-dpp/src/identity/conversion/cbor/mod.rs +++ b/packages/rs-dpp/src/identity/conversion/cbor/mod.rs @@ -1,2 +1 @@ mod v0; -pub use v0::*; diff --git a/packages/rs-dpp/src/identity/mod.rs b/packages/rs-dpp/src/identity/mod.rs index 4260fccf522..902dc9aef48 100644 --- a/packages/rs-dpp/src/identity/mod.rs +++ b/packages/rs-dpp/src/identity/mod.rs @@ -1,6 +1,5 @@ pub use credits_converter::*; -pub use credits_converter::*; -pub use get_biggest_possible_identity::*; + pub use identity::*; #[cfg(feature = "client")] pub use identity_facade::*; diff --git a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs index 7731b02c3d8..dd69e8e9356 100644 --- a/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs +++ b/packages/rs-dpp/src/identity/state_transition/asset_lock_proof/mod.rs @@ -5,7 +5,7 @@ use dashcore::{OutPoint, Transaction}; use serde::{Deserialize, Deserializer, Serialize}; pub use bincode::{Decode, Encode}; -pub use chain::*; + pub use instant::*; use platform_value::Value; use platform_version::version::PlatformVersion; diff --git a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/fields.rs index 4d29a981c1a..c49c87db819 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/contract/data_contract_create_transition/fields.rs @@ -1,7 +1,7 @@ use crate::state_transition::state_transitions; pub use state_transitions::common_fields::property_names::{ - ENTROPY, SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, STATE_TRANSITION_PROTOCOL_VERSION, TRANSITION_TYPE, + ENTROPY, SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, STATE_TRANSITION_PROTOCOL_VERSION, }; pub use state_transitions::contract::common_fields::property_names::{ DATA_CONTRACT, DATA_CONTRACT_ENTROPY, DATA_CONTRACT_ID, DATA_CONTRACT_OWNER_ID, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/fields.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/fields.rs index 40b5fc6173c..74fc567172e 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/fields.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_create_transition/fields.rs @@ -1,7 +1,7 @@ use crate::state_transition::state_transitions; pub use state_transitions::common_fields::property_names::{ - ENTROPY, SIGNATURE, SIGNATURE_PUBLIC_KEY_ID, STATE_TRANSITION_PROTOCOL_VERSION, TRANSITION_TYPE, + SIGNATURE, STATE_TRANSITION_PROTOCOL_VERSION, }; pub use state_transitions::identity::common_fields::property_names::{ ASSET_LOCK_PROOF, IDENTITY_ID, PUBLIC_KEYS, PUBLIC_KEYS_DATA, PUBLIC_KEYS_SIGNATURE, diff --git a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/v0/mod.rs b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/v0/mod.rs index 32d7866c5bd..46f3e151448 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/v0/mod.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/identity/identity_credit_transfer_transition/accessors/v0/mod.rs @@ -1,5 +1,5 @@ use crate::prelude::Revision; -use crate::state_transition::identity_credit_transfer_transition::IdentityCreditTransferTransition; + use platform_value::Identifier; pub trait IdentityCreditTransferTransitionAccessorsV0 { diff --git a/packages/rs-dpp/src/tests/fixtures/mod.rs b/packages/rs-dpp/src/tests/fixtures/mod.rs index 7d999752c4e..60b5cd4dfe2 100644 --- a/packages/rs-dpp/src/tests/fixtures/mod.rs +++ b/packages/rs-dpp/src/tests/fixtures/mod.rs @@ -7,7 +7,7 @@ pub use get_document_transitions_fixture::*; pub use get_documents_fixture::*; pub use get_dpns_data_contract::*; pub use get_dpns_document_fixture::*; -pub use get_dpp::*; + #[cfg(feature = "state-transitions")] pub use get_identity_update_transition_fixture::*; #[cfg(feature = "state-transitions")] @@ -29,8 +29,6 @@ mod get_document_transitions_fixture; pub use get_masternode_reward_shares_documents_fixture::*; -pub use get_documents_fixture::*; - mod get_dashpay_contract_fixture; mod get_dashpay_contract_with_generalized_encryption_key_fixture; mod get_data_contract; diff --git a/packages/rs-drive-abci/src/abci/handler/mod.rs b/packages/rs-drive-abci/src/abci/handler/mod.rs index 8797a3b726e..25fbf1a7a6e 100644 --- a/packages/rs-drive-abci/src/abci/handler/mod.rs +++ b/packages/rs-drive-abci/src/abci/handler/mod.rs @@ -40,8 +40,6 @@ mod execution_result; use crate::abci::server::AbciApplication; use crate::error::execution::ExecutionError; -use dashcore_rpc::dashcore::consensus::Encodable; -use dashcore_rpc::dashcore::hashes::HashEngine; use super::AbciError; use crate::error::Error; @@ -368,7 +366,7 @@ where fn process_proposal( &self, - mut request: RequestProcessProposal, + request: RequestProcessProposal, ) -> Result { let timer = crate::metrics::abci_request_duration("process_proposal"); diff --git a/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs b/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs index cafa016da34..c5fe042a82a 100644 --- a/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs @@ -1,7 +1,7 @@ use crate::error::Error; use crate::execution::check_tx::CheckTxLevel; use crate::execution::validation::state_transition::check_tx_verification::state_transition_to_execution_event_for_check_tx; -use crate::execution::validation::state_transition::processor::process_state_transition; + #[cfg(test)] use crate::platform_types::event_execution_result::EventExecutionResult; #[cfg(test)] diff --git a/packages/rs-drive-abci/src/execution/engine/finalize_block_proposal/v0/mod.rs b/packages/rs-drive-abci/src/execution/engine/finalize_block_proposal/v0/mod.rs index b807a1e5642..1ee33c85963 100644 --- a/packages/rs-drive-abci/src/execution/engine/finalize_block_proposal/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/engine/finalize_block_proposal/v0/mod.rs @@ -1,4 +1,3 @@ -use dashcore_rpc::dashcore::transaction::special_transaction::TransactionPayload::AssetUnlockPayloadType; use dpp::block::epoch::Epoch; use dpp::validation::SimpleValidationResult; @@ -10,8 +9,7 @@ use dpp::block::extended_block_info::v0::ExtendedBlockInfoV0; use dpp::version::PlatformVersion; use dpp::dashcore::bls_sig_utils::BLSSignature; -use dpp::dashcore::consensus::Encodable; -use dpp::dashcore::hashes::Hash; + use tenderdash_abci::{ proto::{serializers::timestamp::ToMilis, types::BlockId as ProtoBlockId}, signatures::Hashable, @@ -62,7 +60,7 @@ where /// pub(super) fn finalize_block_proposal_v0( &self, - mut request_finalize_block: FinalizeBlockCleanedRequest, + request_finalize_block: FinalizeBlockCleanedRequest, transaction: &Transaction, _platform_version: &PlatformVersion, ) -> Result { @@ -231,7 +229,6 @@ where let signatures = commit_info .threshold_vote_extensions .drain(..) - .into_iter() .map(|vote_extension| { let signature_bytes: [u8; 96] = vote_extension.signature.try_into().map_err(|e| { diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/hash_protxhash_with_key_data/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/hash_protxhash_with_key_data/v0/mod.rs index 8e696e032b6..3758afe7c5b 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/hash_protxhash_with_key_data/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_masternode_identities/hash_protxhash_with_key_data/v0/mod.rs @@ -15,9 +15,6 @@ where let mut hasher = Sha256::new(); hasher.update(pro_tx_hash); hasher.update(key_data); - Ok(hasher - .finalize() - .try_into() - .expect("expected a 32 byte hash")) + Ok(hasher.finalize().into()) } } diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs index 26035b5e200..323918cf39d 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_based_updates/update_quorum_info/v0/mod.rs @@ -177,10 +177,7 @@ where .validator_sets() .iter() .map(|(quorum_hash, validator_set)| { - ( - quorum_hash.clone(), - validator_set.threshold_public_key().clone(), - ) + (*quorum_hash, validator_set.threshold_public_key().clone()) }) .collect(); let previous_quorums = block_platform_state diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/mod.rs index f939ef727ce..11d1b02f782 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/mod.rs @@ -4,8 +4,8 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use dashcore_rpc::dashcore_rpc_json::QuorumType; use dpp::bls_signatures::PublicKey as BlsPublicKey; -use dpp::dashcore::{ChainLock, QuorumHash}; -use dpp::platform_value::Bytes32; +use dpp::dashcore::QuorumHash; + use std::collections::BTreeMap; use crate::platform_types::platform::Platform; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs index 8fd8156732c..2fe7283a1c3 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs @@ -1,13 +1,11 @@ use dashcore_rpc::dashcore_rpc_json::QuorumType; use dpp::bls_signatures::PublicKey as BlsPublicKey; use dpp::dashcore::hashes::{sha256d, Hash, HashEngine}; -use dpp::dashcore::{ChainLock, QuorumHash}; +use dpp::dashcore::QuorumHash; use std::collections::BTreeMap; use crate::platform_types::platform::Platform; -use crate::rpc::core::CoreRPCLike; - use crate::execution::platform_events::core_chain_lock::choose_quorum::ReversedQuorumHashBytes; impl Platform { diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/mod.rs index 21df37ba30e..2e022adf5dd 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/mod.rs @@ -8,7 +8,6 @@ use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; -use crate::config::PlatformConfig; use crate::platform_types::platform_state::PlatformState; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs index 815532e8694..d6ea9922c29 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/verify_chain_lock_locally/v0/mod.rs @@ -1,8 +1,7 @@ -use dpp::block::block_info::BlockInfo; use dpp::bls_signatures::G2Element; -use dpp::dashcore::consensus::Encodable; + use dpp::dashcore::hashes::{sha256d, Hash, HashEngine}; -use dpp::dashcore::{ChainLock, QuorumSigningRequestId, VarInt}; +use dpp::dashcore::{ChainLock, QuorumSigningRequestId}; use crate::error::Error; @@ -10,7 +9,6 @@ use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; -use crate::config::PlatformConfig; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::platform_types::platform_state::PlatformState; use dpp::version::PlatformVersion; @@ -236,7 +234,7 @@ where } } - return Ok(Some(chain_lock_verified)); + Ok(Some(chain_lock_verified)) } } diff --git a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/fetch_reward_shares_list_for_masternode/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/fetch_reward_shares_list_for_masternode/v0/mod.rs index 010c5e7f777..ab98ca11eb7 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/fetch_reward_shares_list_for_masternode/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/fetch_reward_shares_list_for_masternode/v0/mod.rs @@ -17,11 +17,11 @@ use drive::dpp::document::Document; use drive::grovedb::TransactionArg; use drive::query::{DriveQuery, InternalClauses, WhereClause, WhereOperator}; +use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::version::PlatformVersion; -use drive::drive::document::query::{QueryDocumentsOutcomeV0Methods}; +use drive::drive::document::query::QueryDocumentsOutcomeV0Methods; use std::collections::BTreeMap; -use dpp::data_contract::accessors::v0::DataContractV0Getters; -use dpp::data_contracts::SystemDataContract; + use crate::execution::platform_events::fee_pool_outwards_distribution::fetch_reward_shares_list_for_masternode::MN_REWARD_SHARES_DOCUMENT_TYPE; impl Platform { diff --git a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs index d1b50852dde..5b5954fcb2f 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/execute_event/v0/mod.rs @@ -1,7 +1,6 @@ -use crate::error::execution::ExecutionError; use crate::error::Error; use crate::execution::types::execution_event::ExecutionEvent; -use crate::execution::types::execution_operation::{ExecutionOperation, OperationLike}; +use crate::execution::types::execution_operation::ExecutionOperation; use crate::platform_types::event_execution_result::EventExecutionResult; use crate::platform_types::event_execution_result::EventExecutionResult::{ ConsensusExecutionError, SuccessfulFreeExecution, SuccessfulPaidExecution, diff --git a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs index fdb4bccf7fa..b273d7d29ff 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/state_transition_processing/validate_fees_of_event/v0/mod.rs @@ -1,17 +1,17 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use crate::execution::types::execution_event::ExecutionEvent; -use crate::execution::types::execution_operation::{ExecutionOperation, OperationLike}; +use crate::execution::types::execution_operation::ExecutionOperation; use crate::platform_types::platform::Platform; use crate::rpc::core::CoreRPCLike; use dpp::block::block_info::BlockInfo; use dpp::consensus::state::identity::IdentityInsufficientBalanceError; use dpp::consensus::state::state_error::StateError; use dpp::fee::fee_result::FeeResult; -use dpp::fee::Credits; + use dpp::prelude::ConsensusValidationResult; use dpp::version::PlatformVersion; -use dpp::ProtocolError; + use drive::grovedb::TransactionArg; impl Platform diff --git a/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs index 8562c69f257..910579e153c 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs @@ -1,19 +1,16 @@ use dpp::block::block_info::BlockInfo; -use dpp::block::epoch::Epoch; + use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::document::document_methods::DocumentMethodsV0; use dpp::document::{DocumentV0Getters, DocumentV0Setters}; use dpp::version::PlatformVersion; -use drive::drive::identity::withdrawals::{ - WithdrawalTransactionIndex, WithdrawalTransactionIndexAndBytes, -}; +use drive::drive::identity::withdrawals::WithdrawalTransactionIndexAndBytes; use drive::grovedb::TransactionArg; use dpp::system_data_contracts::withdrawals_contract; use dpp::system_data_contracts::withdrawals_contract::v1::document_types::withdrawal; use drive::drive::config::DEFAULT_QUERY_LIMIT; -use drive::query::DriveQuery; use crate::{ error::{execution::ExecutionError, Error}, diff --git a/packages/rs-drive-abci/src/execution/storage/mod.rs b/packages/rs-drive-abci/src/execution/storage/mod.rs index c45853e2599..54302920e5d 100644 --- a/packages/rs-drive-abci/src/execution/storage/mod.rs +++ b/packages/rs-drive-abci/src/execution/storage/mod.rs @@ -1,5 +1,2 @@ mod fetch_platform_state; mod store_platform_state; - -pub use fetch_platform_state::*; -pub use store_platform_state::*; diff --git a/packages/rs-drive-abci/src/execution/types/block_execution_context/v0/mod.rs b/packages/rs-drive-abci/src/execution/types/block_execution_context/v0/mod.rs index 0ae169080c8..9f6aaa8f4ea 100644 --- a/packages/rs-drive-abci/src/execution/types/block_execution_context/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/types/block_execution_context/v0/mod.rs @@ -32,8 +32,7 @@ use crate::execution::types::block_state_info::BlockStateInfo; use crate::platform_types::epoch_info::EpochInfo; use crate::platform_types::platform_state::PlatformState; use crate::platform_types::withdrawal::unsigned_withdrawal_txs::v0::UnsignedWithdrawalTxs; -use dashcore_rpc::dashcore::Txid; -use std::collections::BTreeMap; + use tenderdash_abci::proto::abci::ResponsePrepareProposal; /// V0 of the Block execution context diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs index ce09c729f6e..7972ad50cf1 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/validate/instant/mod.rs @@ -1,14 +1,10 @@ -use crate::error::execution::ExecutionError; use crate::error::Error; use crate::platform_types::platform::PlatformRef; use crate::rpc::core::CoreRPCLike; use crate::rpc::signature::CoreSignatureVerification; -use dpp::consensus::basic::identity::{ - IdentityAssetLockTransactionOutPointAlreadyExistsError, - InvalidInstantAssetLockProofSignatureError, -}; +use dpp::consensus::basic::identity::InvalidInstantAssetLockProofSignatureError; use dpp::identity::state_transition::asset_lock_proof::InstantAssetLockProof; -use dpp::platform_value::Bytes36; + use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; use drive::grovedb::TransactionArg; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs index cff397074bb..38968603429 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/instant/mod.rs @@ -1,7 +1,7 @@ use crate::error::execution::ExecutionError; use crate::error::Error; use crate::platform_types::platform::PlatformRef; -use crate::rpc::core::CoreRPCLike; + use dpp::consensus::basic::identity::{ IdentityAssetLockTransactionOutPointAlreadyExistsError, }; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs index 9a864e4492f..b3bb74b03d7 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/common/asset_lock/proof/verify_is_not_spent/mod.rs @@ -3,7 +3,7 @@ mod instant; use crate::error::Error; use crate::platform_types::platform::PlatformRef; -use crate::rpc::core::CoreRPCLike; + use dpp::prelude::AssetLockProof; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs index f9d712bc9a0..83da2910269 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/processor/v0/mod.rs @@ -4,20 +4,19 @@ use crate::execution::validation::state_transition::transformer::StateTransition use crate::platform_types::platform::{PlatformRef, PlatformStateRef}; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::rpc::core::CoreRPCLike; -use dpp::identity::{KeyType, PartialIdentity}; +use dpp::identity::PartialIdentity; use dpp::prelude::ConsensusValidationResult; +use crate::error::execution::ExecutionError; use dpp::serialization::Signable; -use dpp::state_transition::{StateTransition}; -use drive::state_transition_action::StateTransitionAction; +use dpp::state_transition::StateTransition; use dpp::validation::SimpleConsensusValidationResult; use dpp::version::{DefaultForPlatformVersion, PlatformVersion}; use drive::drive::Drive; use drive::grovedb::TransactionArg; -use crate::error::execution::ExecutionError; -use crate::execution::types::execution_operation::ExecutionOperation; -use crate::execution::types::execution_operation::signature_verification_operation::SignatureVerificationOperation; -use crate::execution::types::state_transition_execution_context::{StateTransitionExecutionContext, StateTransitionExecutionContextMethodsV0}; +use drive::state_transition_action::StateTransitionAction; + +use crate::execution::types::state_transition_execution_context::{StateTransitionExecutionContext}; use crate::execution::validation::state_transition::common::validate_state_transition_identity_signed::{ValidateStateTransitionIdentitySignature}; use crate::execution::validation::state_transition::state_transitions::identity_update::identity_and_signatures::v0::IdentityUpdateStateTransitionIdentityAndSignaturesValidationV0; use crate::execution::validation::state_transition::state_transitions::identity_create::identity_and_signatures::v0::IdentityCreateStateTransitionIdentityAndSignaturesValidationV0; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs index 3f70ebd708b..38260cc57e4 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs @@ -87,7 +87,7 @@ pub fn delete_withdrawal_data_trigger_v0( )? .documents_owned(); - let Some(withdrawal) = withdrawals.get(0) else { + let Some(withdrawal) = withdrawals.first() else { let err = DataTriggerConditionError::new( data_contract.id(), dt_delete.base().id(), diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs index 97f654619a9..b7e249c1f27 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_create/state/v0/mod.rs @@ -14,7 +14,7 @@ use dpp::identity::state_transition::AssetLockProved; use dpp::prelude::ConsensusValidationResult; use dpp::serialization::Signable; use dpp::state_transition::identity_create_transition::accessors::IdentityCreateTransitionAccessorsV0; -use dpp::state_transition::identity_create_transition::methods::IdentityCreateTransitionMethodsV0; + use dpp::state_transition::identity_create_transition::IdentityCreateTransition; use dpp::state_transition::{StateTransition, StateTransitionLike}; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/state/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/state/v0/mod.rs index 6532f3ba87b..564ca18b086 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/state/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/identity_top_up/state/v0/mod.rs @@ -12,7 +12,7 @@ use dpp::identity::KeyType; use dpp::prelude::ConsensusValidationResult; use dpp::serialization::Signable; -use dpp::state_transition::identity_topup_transition::methods::IdentityTopUpTransitionMethodsV0; + use dpp::state_transition::identity_topup_transition::IdentityTopUpTransition; use dpp::state_transition::{StateTransition, StateTransitionLike}; diff --git a/packages/rs-drive-abci/src/platform_types/commit/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/commit/v0/mod.rs index 07bb19c51b2..0d0513aa47d 100644 --- a/packages/rs-drive-abci/src/platform_types/commit/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/commit/v0/mod.rs @@ -37,7 +37,7 @@ impl CommitV0 { quorum_type, inner: proto::types::Commit { - block_id: Some(block_id.try_into().expect("cannot convert block id")), + block_id: Some(block_id.into()), height: height as i64, round: ci.round as i32, // we need to "un-reverse" quorum hash, as it was reversed in [CleanedCommitInfo::try_from] diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs b/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs index 8c7bf8ddc5f..4a7b87d4634 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/mod.rs @@ -13,9 +13,7 @@ use dpp::bincode::{config, Decode, Encode}; use dpp::block::epoch::Epoch; use dpp::block::extended_block_info::ExtendedBlockInfo; use dpp::dashcore::{ProTxHash, QuorumHash}; -use dpp::serialization::{ - PlatformDeserializable, PlatformDeserializableFromVersionedStructure, PlatformSerializable, -}; +use dpp::serialization::{PlatformDeserializableFromVersionedStructure, PlatformSerializable}; use dpp::util::deserializer::ProtocolVersion; use dpp::version::{PlatformVersion, TryFromPlatformVersioned, TryIntoPlatformVersioned}; diff --git a/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs b/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs index 2cb112bdaf0..556f81da555 100644 --- a/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs +++ b/packages/rs-drive-abci/src/platform_types/platform_state/v0/mod.rs @@ -19,7 +19,7 @@ use dpp::block::block_info::{BlockInfo, DEFAULT_BLOCK_INFO}; use dpp::block::extended_block_info::v0::ExtendedBlockInfoV0Getters; use dpp::bls_signatures::PublicKey as ThresholdBlsPublicKey; use dpp::version::{PlatformVersion, TryIntoPlatformVersioned}; -use drive::grovedb::batch::Op; + use std::collections::BTreeMap; use std::fmt::{Debug, Formatter}; diff --git a/packages/rs-drive-abci/src/rpc/core.rs b/packages/rs-drive-abci/src/rpc/core.rs index 4693c20ffb7..48e3e839be7 100644 --- a/packages/rs-drive-abci/src/rpc/core.rs +++ b/packages/rs-drive-abci/src/rpc/core.rs @@ -1,17 +1,15 @@ use dashcore_rpc::dashcore::ephemerealdata::chain_lock::ChainLock; use dashcore_rpc::dashcore::{Block, BlockHash, QuorumHash, Transaction, Txid}; use dashcore_rpc::dashcore_rpc_json::{ - AssetUnlockStatusResult, ExtendedQuorumDetails, ExtendedQuorumListResult, - GetBestChainLockResult, GetChainTipsResult, GetTransactionLockedResult, MasternodeListDiff, - MnSyncStatus, QuorumInfoResult, QuorumType, SoftforkInfo, + AssetUnlockStatusResult, ExtendedQuorumDetails, ExtendedQuorumListResult, GetChainTipsResult, + MasternodeListDiff, MnSyncStatus, QuorumInfoResult, QuorumType, SoftforkInfo, }; use dashcore_rpc::json::GetRawTransactionResult; use dashcore_rpc::{Auth, Client, Error, RpcApi}; -use dpp::dashcore::{hashes::Hash, InstantLock}; +use dpp::dashcore::InstantLock; use serde_json::Value; use std::collections::HashMap; use std::time::Duration; -use tenderdash_abci::proto::types::CoreChainLock; /// Information returned by QuorumListExtended pub type QuorumListExtendedInfo = HashMap; diff --git a/packages/rs-drive-abci/tests/strategy_tests/chain_lock_update.rs b/packages/rs-drive-abci/tests/strategy_tests/chain_lock_update.rs index a6a3e57e894..38e902fdb00 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/chain_lock_update.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/chain_lock_update.rs @@ -1,15 +1,11 @@ #[cfg(test)] mod tests { - use dpp::dashcore::hashes::Hash; - use dpp::dashcore::{BlockHash, ChainLock}; - use tenderdash_abci::proto::types::CoreChainLock; use crate::execution::run_chain_for_strategy; use crate::strategy::CoreHeightIncrease::RandomCoreHeightIncrease; use crate::strategy::{MasternodeListChangesStrategy, NetworkStrategy}; use drive_abci::config::{ExecutionConfig, PlatformConfig, PlatformTestConfig}; - use drive_abci::platform_types::platform_state::v0::PlatformStateV0Methods; - use drive_abci::platform_types::validator_set::v0::ValidatorSetV0Getters; + use drive_abci::test::helpers::setup::TestPlatformBuilder; use strategy_tests::frequency::Frequency; use strategy_tests::Strategy; diff --git a/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs b/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs index 9c097506251..4f4e4b8bba4 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/core_update_tests.rs @@ -1,8 +1,5 @@ #[cfg(test)] mod tests { - use dpp::dashcore::hashes::Hash; - use dpp::dashcore::{BlockHash, ChainLock}; - use tenderdash_abci::proto::types::CoreChainLock; use crate::execution::run_chain_for_strategy; use crate::strategy::CoreHeightIncrease::RandomCoreHeightIncrease; diff --git a/packages/rs-drive-abci/tests/strategy_tests/execution.rs b/packages/rs-drive-abci/tests/strategy_tests/execution.rs index 4d4ac7c6ff5..bc0573098b1 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/execution.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/execution.rs @@ -557,7 +557,7 @@ pub(crate) fn run_chain_for_strategy( .as_slice() .try_into() .expect("Expected a byte array of length 32"); - (quorum_hash.clone(), fixed_bytes) + (*quorum_hash, fixed_bytes) }) .collect(); @@ -579,7 +579,7 @@ pub(crate) fn run_chain_for_strategy( let block_hash = *core_blocks .get(&block_height) - .expect(format!("expected a block hash to be known for {}", core_height).as_str()); + .unwrap_or_else(|| panic!("expected a block hash to be known for {}", core_height)); let chain_lock = if sign_chain_locks { // From DIP 8: https://github.com/dashpay/dips/blob/master/dip-0008.md#finalization-of-signed-blocks @@ -654,7 +654,7 @@ pub(crate) fn run_chain_for_strategy( platform .core_rpc .expect_submit_chain_lock() - .returning(move |chain_lock: &ChainLock| return Ok(chain_lock.block_height)); + .returning(move |chain_lock: &ChainLock| Ok(chain_lock.block_height)); create_chain_for_strategy( platform, @@ -952,7 +952,7 @@ pub(crate) fn continue_chain_for_strategy( let MimicExecuteBlockOutcome { state_transaction_results, - withdrawal_transactions: mut withdrawals_this_block, + withdrawal_transactions: withdrawals_this_block, validator_set_update, next_validator_set_hash, root_app_hash, diff --git a/packages/rs-drive-abci/tests/strategy_tests/failures.rs b/packages/rs-drive-abci/tests/strategy_tests/failures.rs index bf8df7f8a4a..82199d963e7 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/failures.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/failures.rs @@ -11,14 +11,14 @@ mod tests { use drive_abci::config::{ExecutionConfig, PlatformConfig, PlatformTestConfig}; - use crate::strategy::CoreHeightIncrease::{KnownCoreHeightIncreases, NoCoreHeightIncrease}; + use crate::strategy::CoreHeightIncrease::KnownCoreHeightIncreases; use dpp::dashcore::hashes::Hash; use dpp::dashcore::{BlockHash, ChainLock}; use dpp::data_contract::accessors::v0::{DataContractV0Getters, DataContractV0Setters}; use dpp::data_contract::document_type::random_document::{ DocumentFieldFillSize, DocumentFieldFillType, }; - use dpp::data_contracts::SystemDataContract; + use dpp::identity::accessors::IdentityGettersV0; use dpp::platform_value::Value; use dpp::prelude::Identity; @@ -27,7 +27,6 @@ mod tests { use drive_abci::test::helpers::setup::TestPlatformBuilder; use simple_signer::signer::SimpleSigner; use strategy_tests::operations::{DocumentAction, DocumentOp, Operation, OperationType}; - use tenderdash_abci::proto::types::CoreChainLock; #[test] fn run_chain_insert_one_new_identity_and_a_contract_with_bad_update() { diff --git a/packages/rs-drive-abci/tests/strategy_tests/main.rs b/packages/rs-drive-abci/tests/strategy_tests/main.rs index 3a749b6fc8f..e1eb94857ae 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/main.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/main.rs @@ -62,6 +62,13 @@ mod verify_state_transitions; pub type BlockHeight = u64; +fn asset_unlock_index(tx: &Transaction) -> u64 { + let Some(AssetUnlockPayloadType(ref payload)) = tx.special_transaction_payload else { + panic!("expected to get AssetUnlockPayloadType"); + }; + payload.base.index +} + #[cfg(test)] mod tests { use super::*; @@ -96,14 +103,13 @@ mod tests { use drive::drive::config::DEFAULT_QUERY_LIMIT; use drive::drive::identity::withdrawals::WithdrawalTransactionIndex; use drive_abci::config::{ExecutionConfig, PlatformTestConfig}; - use drive_abci::error::execution::ExecutionError; - use drive_abci::error::Error; + use drive_abci::logging::LogLevel; use drive_abci::platform_types::platform_state::v0::PlatformStateV0Methods; use drive_abci::rpc::core::QuorumListExtendedInfo; use itertools::Itertools; use tenderdash_abci::proto::abci::{RequestInfo, ResponseInfo}; - use tenderdash_abci::proto::types::CoreChainLock; + use tenderdash_abci::Application; pub fn generate_quorums_extended_info(n: u32) -> QuorumListExtendedInfo { @@ -2247,7 +2253,7 @@ mod tests { .unwrap() .asset_unlock_statuses .get(index) - .map(|status| status.clone()) + .cloned() .unwrap() }) .collect()) @@ -2293,7 +2299,7 @@ mod tests { platform_version, ) .unwrap(); - assert!(withdrawal_documents_pooled.len() > 0); + assert!(!withdrawal_documents_pooled.is_empty()); let pooled_withdrawals = withdrawal_documents_pooled.len(); (outcome, pooled_withdrawals) @@ -2431,7 +2437,7 @@ mod tests { .unwrap(); // In this block we should have new withdrawals pooled - assert!(withdrawal_documents_pooled.len() > 0); + assert!(!withdrawal_documents_pooled.is_empty()); // And extra withdrawals broadcasted let withdrawals_broadcasted_expected = @@ -2551,7 +2557,7 @@ mod tests { .unwrap(); // In this block we should have new withdrawals pooled - assert!(withdrawal_documents_pooled.len() > 0); + assert!(!withdrawal_documents_pooled.is_empty()); // And some withdrawals completed let withdrawals_completed_expected = @@ -2600,16 +2606,7 @@ mod tests { // Run block 6. // Tests withdrawal expiration - let ChainExecutionOutcome { - abci_app, - proposers, - quorums, - current_quorum_hash, - current_proposer_versions, - end_time_ms, - withdrawals, - .. - } = { + let ChainExecutionOutcome { .. } = { let outcome = continue_chain_for_strategy( abci_app, ChainExecutionParameters { @@ -2677,7 +2674,7 @@ mod tests { .unwrap(); // In this block we should have new withdrawals pooled - assert!(withdrawal_documents_pooled.len() > 0); + assert!(!withdrawal_documents_pooled.is_empty()); // Amount of completed withdrawals stays the same as in the last block assert_eq!( @@ -3306,7 +3303,7 @@ mod tests { let outcome = run_chain_for_strategy(&mut platform, 15, strategy, config, 15); - let balances = &outcome + let _balances = &outcome .abci_app .platform .drive @@ -3364,10 +3361,3 @@ mod tests { assert_eq!(state_transitions.len(), 3); } } - -fn asset_unlock_index(tx: &Transaction) -> u64 { - let Some(AssetUnlockPayloadType(ref payload)) = tx.special_transaction_payload else { - panic!("expected to get AssetUnlockPayloadType"); - }; - payload.base.index -} diff --git a/packages/rs-drive-abci/tests/strategy_tests/query.rs b/packages/rs-drive-abci/tests/strategy_tests/query.rs index 9ecef4c7145..aa6d0cb8225 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/query.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/query.rs @@ -351,9 +351,7 @@ mod tests { use strategy_tests::Strategy; use crate::strategy::CoreHeightIncrease::RandomCoreHeightIncrease; - use dpp::dashcore::hashes::Hash; - use dpp::dashcore::{BlockHash, ChainLock}; - use tenderdash_abci::proto::types::CoreChainLock; + use tenderdash_abci::Application; macro_rules! extract_single_variant_or_panic { diff --git a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs index 5dcc6c55f81..a2b09b9763e 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/strategy.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/strategy.rs @@ -1,7 +1,7 @@ use crate::masternodes::MasternodeListItemWithUpdates; use crate::query::QueryStrategy; use crate::BlockHeight; -use dashcore_rpc::dashcore; + use dashcore_rpc::dashcore::{ProTxHash, QuorumHash}; use dpp::block::block_info::BlockInfo; @@ -197,7 +197,7 @@ impl CoreHeightIncrease { } CoreHeightIncrease::KnownCoreHeightIncreases(values) => { if values.len() == 1 { - *values.get(0).unwrap() + *values.first().unwrap() } else { values.pop().unwrap() } diff --git a/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs b/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs index e3954dfd102..79796d00afe 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/upgrade_fork_tests.rs @@ -5,7 +5,6 @@ mod tests { use dpp::dashcore::{BlockHash, ChainLock}; use dpp::version::PlatformVersion; use drive::drive::config::DriveConfig; - use tenderdash_abci::proto::types::CoreChainLock; use crate::execution::{continue_chain_for_strategy, run_chain_for_strategy}; use crate::strategy::{ diff --git a/packages/rs-drive-abci/tests/strategy_tests/verify_state_transitions.rs b/packages/rs-drive-abci/tests/strategy_tests/verify_state_transitions.rs index 950b8138a72..ac834290a97 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/verify_state_transitions.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/verify_state_transitions.rs @@ -6,7 +6,7 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters; use dpp::document::Document; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; -use dpp::identity::PartialIdentity; + use dpp::state_transition::StateTransition; use dpp::version::PlatformVersion; use drive::drive::identity::key::fetch::IdentityKeysRequest; diff --git a/packages/rs-drive-proof-verifier/src/proof.rs b/packages/rs-drive-proof-verifier/src/proof.rs index 005b6787965..c26547e1d30 100644 --- a/packages/rs-drive-proof-verifier/src/proof.rs +++ b/packages/rs-drive-proof-verifier/src/proof.rs @@ -29,7 +29,7 @@ use dpp::version::PlatformVersion; use drive::drive::identity::key::fetch::{ IdentityKeysRequest, KeyKindRequestType, KeyRequestType, PurposeU8, SecurityLevelU8, }; -pub use drive::drive::verify::RootHash; + use drive::drive::Drive; use drive::query::DriveQuery; diff --git a/packages/rs-drive-proof-verifier/src/verify.rs b/packages/rs-drive-proof-verifier/src/verify.rs index 51cb55d909b..534e5056ff4 100644 --- a/packages/rs-drive-proof-verifier/src/verify.rs +++ b/packages/rs-drive-proof-verifier/src/verify.rs @@ -1,6 +1,6 @@ use dapi_grpc::platform::v0::{Proof, ResponseMetadata}; use dpp::bls_signatures; -pub use drive::drive::verify::RootHash; + use tenderdash_abci::{ proto::types::{CanonicalVote, SignedMsgType, StateId}, signatures::{Hashable, Signable}, diff --git a/packages/rs-drive/src/drive/balances/mod.rs b/packages/rs-drive/src/drive/balances/mod.rs index 24970fe316a..75c1d02e245 100644 --- a/packages/rs-drive/src/drive/balances/mod.rs +++ b/packages/rs-drive/src/drive/balances/mod.rs @@ -4,28 +4,18 @@ #[cfg(feature = "full")] mod add_to_system_credits; -#[cfg(feature = "full")] -pub use add_to_system_credits::*; #[cfg(feature = "full")] mod add_to_system_credits_operations; -#[cfg(feature = "full")] -pub use add_to_system_credits_operations::*; #[cfg(feature = "full")] mod remove_from_system_credits; -#[cfg(feature = "full")] -pub use remove_from_system_credits::*; #[cfg(feature = "full")] mod remove_from_system_credits_operations; -#[cfg(feature = "full")] -pub use remove_from_system_credits_operations::*; #[cfg(feature = "full")] mod calculate_total_credits_balance; -#[cfg(feature = "full")] -pub use calculate_total_credits_balance::*; #[cfg(any(feature = "full", feature = "verify"))] use crate::drive::RootTree; diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/document.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/document.rs index b5fc6a27725..6945edd286f 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/document.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/document.rs @@ -16,7 +16,6 @@ use dpp::prelude::Identifier; use dpp::system_data_contracts::withdrawals_contract::v1::document_types::withdrawal; -use dpp::data_contracts::SystemDataContract; use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/mod.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/mod.rs index 9f5f5f3facb..b58a435e66e 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/mod.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/mod.rs @@ -1,5 +1,2 @@ mod apply_drive_operations; mod convert_drive_operations_to_grove_operations; - -pub use apply_drive_operations::*; -pub use convert_drive_operations_to_grove_operations::*; diff --git a/packages/rs-drive/src/drive/contract/estimation_costs/mod.rs b/packages/rs-drive/src/drive/contract/estimation_costs/mod.rs index 43fcd9c603a..11258554b45 100644 --- a/packages/rs-drive/src/drive/contract/estimation_costs/mod.rs +++ b/packages/rs-drive/src/drive/contract/estimation_costs/mod.rs @@ -1,3 +1,2 @@ /// The estimated costs for a contract insert mod add_estimation_costs_for_contract_insertion; -pub use add_estimation_costs_for_contract_insertion::*; diff --git a/packages/rs-drive/src/drive/contract/prove/mod.rs b/packages/rs-drive/src/drive/contract/prove/mod.rs index e1776aff435..6b3e674d2d0 100644 --- a/packages/rs-drive/src/drive/contract/prove/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/mod.rs @@ -1,11 +1,8 @@ /// The `prove_contract` module provides functionality for getting a proved contract. mod prove_contract; -pub use prove_contract::*; /// The `prove_contract_history` module provides functionality for getting contract historical proofs. mod prove_contract_history; -pub use prove_contract_history::*; /// The `prove_contract` module provides functionality for getting multiple proved contracts. mod prove_contracts; -pub use prove_contracts::*; diff --git a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/mod.rs b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/mod.rs index 27cc0484b06..81a2f38751c 100644 --- a/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/mod.rs +++ b/packages/rs-drive/src/drive/credit_pools/pending_epoch_refunds/mod.rs @@ -41,6 +41,4 @@ mod methods; mod operations; mod paths; -pub use methods::*; -pub use operations::*; pub use paths::*; diff --git a/packages/rs-drive/src/drive/document/delete/mod.rs b/packages/rs-drive/src/drive/document/delete/mod.rs index 8f88c41c9a6..62f1eb61bf0 100644 --- a/packages/rs-drive/src/drive/document/delete/mod.rs +++ b/packages/rs-drive/src/drive/document/delete/mod.rs @@ -35,52 +35,42 @@ // Module: delete_document_for_contract // This module contains functionality for deleting a document associated with a given contract mod delete_document_for_contract; -pub use delete_document_for_contract::*; // Module: delete_document_for_contract_id // This module contains functionality for deleting a document associated with a given contract id mod delete_document_for_contract_id; -pub use delete_document_for_contract_id::*; // Module: delete_document_for_contract_apply_and_add_to_operations // This module contains functionality to apply a delete operation and add to the operations of a contract mod delete_document_for_contract_apply_and_add_to_operations; -pub use delete_document_for_contract_apply_and_add_to_operations::*; // Module: remove_document_from_primary_storage // This module contains functionality to remove a document from primary storage mod remove_document_from_primary_storage; -pub use remove_document_from_primary_storage::*; // Module: remove_reference_for_index_level_for_contract_operations // This module contains functionality to remove a reference for an index level for contract operations mod remove_reference_for_index_level_for_contract_operations; -pub use remove_reference_for_index_level_for_contract_operations::*; // Module: remove_indices_for_index_level_for_contract_operations // This module contains functionality to remove indices for an index level for contract operations mod remove_indices_for_index_level_for_contract_operations; -pub use remove_indices_for_index_level_for_contract_operations::*; // Module: remove_indices_for_top_index_level_for_contract_operations // This module contains functionality to remove indices for the top index level for contract operations mod remove_indices_for_top_index_level_for_contract_operations; -pub use remove_indices_for_top_index_level_for_contract_operations::*; // Module: delete_document_for_contract_id_with_named_type_operations // This module contains functionality to delete a document for a contract id with named type operations mod delete_document_for_contract_id_with_named_type_operations; -pub use delete_document_for_contract_id_with_named_type_operations::*; // Module: delete_document_for_contract_with_named_type_operations // This module contains functionality to delete a document for a contract with named type operations mod delete_document_for_contract_with_named_type_operations; -pub use delete_document_for_contract_with_named_type_operations::*; // Module: delete_document_for_contract_operations // This module contains functionality to delete a document for contract operations mod delete_document_for_contract_operations; -pub use delete_document_for_contract_operations::*; mod internal; diff --git a/packages/rs-drive/src/drive/document/estimation_costs/mod.rs b/packages/rs-drive/src/drive/document/estimation_costs/mod.rs index 51c40696624..609c8ef5183 100644 --- a/packages/rs-drive/src/drive/document/estimation_costs/mod.rs +++ b/packages/rs-drive/src/drive/document/estimation_costs/mod.rs @@ -1,5 +1,3 @@ mod stateless_delete_of_non_tree_for_costs; -pub use stateless_delete_of_non_tree_for_costs::*; mod add_estimation_costs_for_add_document_to_primary_storage; -pub use add_estimation_costs_for_add_document_to_primary_storage::*; diff --git a/packages/rs-drive/src/drive/document/index_uniqueness/mod.rs b/packages/rs-drive/src/drive/document/index_uniqueness/mod.rs index 0a35800771d..1e84677b018 100644 --- a/packages/rs-drive/src/drive/document/index_uniqueness/mod.rs +++ b/packages/rs-drive/src/drive/document/index_uniqueness/mod.rs @@ -36,8 +36,7 @@ mod internal; mod validate_document_create_transition_action_uniqueness; -pub use validate_document_create_transition_action_uniqueness::*; + mod validate_document_replace_transition_action_uniqueness; -pub use validate_document_replace_transition_action_uniqueness::*; + mod validate_document_uniqueness; -pub use validate_document_uniqueness::*; diff --git a/packages/rs-drive/src/drive/document/insert/mod.rs b/packages/rs-drive/src/drive/document/insert/mod.rs index 8bff50895c3..618d66c5e95 100644 --- a/packages/rs-drive/src/drive/document/insert/mod.rs +++ b/packages/rs-drive/src/drive/document/insert/mod.rs @@ -35,42 +35,34 @@ // Module: add_document // This module contains functionality for adding a document mod add_document; -pub use add_document::*; // Module: add_document_for_contract // This module contains functionality for adding a document for a given contract mod add_document_for_contract; -pub use add_document_for_contract::*; // Module: add_document_for_contract_apply_and_add_to_operations // This module contains functionality for applying and adding operations for a contract document mod add_document_for_contract_apply_and_add_to_operations; -pub use add_document_for_contract_apply_and_add_to_operations::*; // Module: add_document_for_contract_operations // This module contains functionality for adding a document for contract operations mod add_document_for_contract_operations; -pub use add_document_for_contract_operations::*; // Module: add_document_to_primary_storage // This module contains functionality for adding a document to primary storage mod add_document_to_primary_storage; -pub use add_document_to_primary_storage::*; // Module: add_indices_for_index_level_for_contract_operations // This module contains functionality for adding indices for an index level for contract operations mod add_indices_for_index_level_for_contract_operations; -pub use add_indices_for_index_level_for_contract_operations::*; // Module: add_indices_for_top_index_level_for_contract_operations // This module contains functionality for adding indices for the top index level for contract operations mod add_indices_for_top_index_level_for_contract_operations; -pub use add_indices_for_top_index_level_for_contract_operations::*; // Module: add_reference_for_index_level_for_contract_operations // This module contains functionality for adding a reference for an index level for contract operations mod add_reference_for_index_level_for_contract_operations; -pub use add_reference_for_index_level_for_contract_operations::*; #[cfg(all( feature = "fixtures-and-mocks", diff --git a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs index 082b51ed4ef..f6decc23b65 100644 --- a/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/document/update/internal/update_document_for_contract_operations/v0/mod.rs @@ -175,7 +175,7 @@ impl Drive { .iter() .map(|&x| Vec::from(x)) .collect(); - let top_index_property = index.properties.get(0).ok_or(Error::Drive( + let top_index_property = index.properties.first().ok_or(Error::Drive( DriveError::CorruptedContractIndexes("invalid contract indices"), ))?; index_path.push(Vec::from(top_index_property.name.as_bytes())); diff --git a/packages/rs-drive/src/drive/document/update/mod.rs b/packages/rs-drive/src/drive/document/update/mod.rs index d0eacee6ced..1f627982f0e 100644 --- a/packages/rs-drive/src/drive/document/update/mod.rs +++ b/packages/rs-drive/src/drive/document/update/mod.rs @@ -36,30 +36,22 @@ // This module contains functionality for adding operations to update multiple documents #[cfg(feature = "full")] mod add_update_multiple_documents_operations; -#[cfg(feature = "full")] -pub use add_update_multiple_documents_operations::*; // Module: update_document_for_contract // This module contains functionality for updating a document for a given contract #[cfg(feature = "full")] mod update_document_for_contract; -#[cfg(feature = "full")] -pub use update_document_for_contract::*; // Module: update_document_for_contract_id // This module contains functionality for updating a document associated with a given contract id #[cfg(feature = "full")] mod update_document_for_contract_id; -#[cfg(feature = "full")] -pub use update_document_for_contract_id::*; // Module: update_document_with_serialization_for_contract // This module contains functionality for updating a document (with serialization) for a contract mod internal; mod update_document_with_serialization_for_contract; -pub use update_document_with_serialization_for_contract::*; - #[cfg(test)] mod tests { use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/platform_state/mod.rs b/packages/rs-drive/src/drive/platform_state/mod.rs index eb34a17d339..d6a0ce16c49 100644 --- a/packages/rs-drive/src/drive/platform_state/mod.rs +++ b/packages/rs-drive/src/drive/platform_state/mod.rs @@ -1,7 +1,4 @@ mod fetch_platform_state_bytes; mod store_platform_state_bytes; -pub use fetch_platform_state_bytes::*; -pub use store_platform_state_bytes::*; - const PLATFORM_STATE_KEY: &[u8; 11] = b"saved_state"; diff --git a/packages/rs-drive/src/drive/system/protocol_version/mod.rs b/packages/rs-drive/src/drive/system/protocol_version/mod.rs index d561094fc84..82b984d14bf 100644 --- a/packages/rs-drive/src/drive/system/protocol_version/mod.rs +++ b/packages/rs-drive/src/drive/system/protocol_version/mod.rs @@ -1,8 +1,7 @@ mod fetch_current_protocol_version; -pub use fetch_current_protocol_version::*; + mod fetch_next_protocol_version; -pub use fetch_next_protocol_version::*; + mod store_current_protocol_version; -pub use store_current_protocol_version::*; + mod set_next_protocol_version_operations; -pub use set_next_protocol_version_operations::*; diff --git a/packages/rs-drive/src/drive/system/protocol_version/store_current_protocol_version.rs b/packages/rs-drive/src/drive/system/protocol_version/store_current_protocol_version.rs index bb954764120..dd4b537a5a4 100644 --- a/packages/rs-drive/src/drive/system/protocol_version/store_current_protocol_version.rs +++ b/packages/rs-drive/src/drive/system/protocol_version/store_current_protocol_version.rs @@ -1,4 +1,3 @@ -use crate::drive::grove_operations::BatchInsertApplyType; use crate::drive::object_size_info::PathKeyElementInfo; use crate::drive::system::misc_path; use crate::drive::system::misc_tree_constants::PROTOCOL_VERSION_STORAGE_KEY; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs index 85274d9d63a..fd1b6c15aae 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/mod.rs @@ -8,7 +8,7 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; +pub use dpp::prelude::Identity; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs index 24c41e34716..cbbf72ba6d2 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_full_identities_by_public_key_hashes/v0/mod.rs @@ -5,7 +5,7 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; +pub use dpp::prelude::Identity; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_identity_id/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_identity_id/mod.rs index 8a43835193b..23aa069a5fe 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_identity_id/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_identity_id/mod.rs @@ -8,7 +8,7 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; +pub use dpp::prelude::Identity; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/mod.rs index 974d9c41b7d..a84401becfd 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/mod.rs @@ -8,7 +8,7 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; +pub use dpp::prelude::Identity; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/v0/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/v0/mod.rs index 21008f75164..9f8c971c812 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_full_identity_by_public_key_hash/v0/mod.rs @@ -4,7 +4,7 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; +pub use dpp::prelude::Identity; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/mod.rs index c2336bc42c5..4aa3d7a51f3 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/mod.rs @@ -8,8 +8,6 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use dpp::version::PlatformVersion; impl Drive { diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/v0/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/v0/mod.rs index 93d8c5b228c..89519d1e7fa 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/v0/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_balance_for_identity_id/v0/mod.rs @@ -7,8 +7,6 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use grovedb::GroveDb; impl Drive { diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/mod.rs index 51da29aab8b..d8adb1efacb 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/mod.rs @@ -9,8 +9,6 @@ use dpp::fee::Credits; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use dpp::version::PlatformVersion; use std::iter::FromIterator; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs index 588e1ec8651..3d265e802c3 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_balances_for_identity_ids/v0/mod.rs @@ -6,8 +6,6 @@ use dpp::fee::Credits; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use grovedb::GroveDb; impl Drive { diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/mod.rs index 253b7aeba34..830fbc31b58 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/mod.rs @@ -8,8 +8,6 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use dpp::version::PlatformVersion; impl Drive { diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/v0/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/v0/mod.rs index 578f508ffac..fb83fac0dcc 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_id_by_public_key_hash/v0/mod.rs @@ -5,8 +5,6 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use grovedb::GroveDb; impl Drive { diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/mod.rs index 7ea04940313..0087600433a 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/mod.rs @@ -8,8 +8,6 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use dpp::version::PlatformVersion; use std::iter::FromIterator; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/v0/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/v0/mod.rs index b6d9245e468..96ec383a406 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/v0/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_ids_by_public_key_hashes/v0/mod.rs @@ -5,8 +5,6 @@ use crate::error::Error; use crate::drive::verify::RootHash; -pub use dpp::prelude::{Identity, Revision}; - use grovedb::GroveDb; impl Drive { diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/mod.rs index 934c1ad035f..d50813ca001 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/mod.rs @@ -9,7 +9,6 @@ use crate::error::Error; use crate::drive::verify::RootHash; use dpp::identity::PartialIdentity; -pub use dpp::prelude::{Identity, Revision}; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs b/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs index 280cc8addd8..4aff6ff97b0 100644 --- a/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs +++ b/packages/rs-drive/src/drive/verify/identity/verify_identity_keys_by_identity_id/v0/mod.rs @@ -9,7 +9,7 @@ use crate::drive::verify::RootHash; use dpp::identifier::Identifier; use dpp::identity::identity_public_key::accessors::v0::IdentityPublicKeyGettersV0; use dpp::identity::{IdentityPublicKey, KeyID, PartialIdentity}; -pub use dpp::prelude::{Identity, Revision}; + use dpp::serialization::PlatformDeserializable; use dpp::version::PlatformVersion; use grovedb::GroveDb; diff --git a/packages/rs-drive/src/fee_pools/epochs/operations_factory.rs b/packages/rs-drive/src/fee_pools/epochs/operations_factory.rs index 34df1ce3ec1..a3b504b4cb9 100644 --- a/packages/rs-drive/src/fee_pools/epochs/operations_factory.rs +++ b/packages/rs-drive/src/fee_pools/epochs/operations_factory.rs @@ -928,7 +928,7 @@ mod tests { assert_eq!(stored_proposers, awaited_result); let deleted_pro_tx_hashes = vec![ - awaited_result.get(0).unwrap().0.clone(), + awaited_result.first().unwrap().0.clone(), awaited_result.get(1).unwrap().0.clone(), ]; diff --git a/packages/rs-drive/src/query/conditions.rs b/packages/rs-drive/src/query/conditions.rs index 83519815b2e..1532d369766 100644 --- a/packages/rs-drive/src/query/conditions.rs +++ b/packages/rs-drive/src/query/conditions.rs @@ -389,7 +389,7 @@ impl<'a> WhereClause { } let field_value = clause_components - .get(0) + .first() .expect("check above enforces it exists"); let field_ref = field_value.as_text().ok_or(Error::Query( QuerySyntaxError::InvalidWhereClauseComponents( @@ -438,7 +438,7 @@ impl<'a> WhereClause { .collect::>(); match lower_range_clauses.len() { 0 => Ok(None), - 1 => Ok(Some(lower_range_clauses.get(0).unwrap())), + 1 => Ok(Some(lower_range_clauses.first().unwrap())), _ => Err(Error::Query(QuerySyntaxError::MultipleRangeClauses( "there can only at most one range clause with a lower bound", ))), @@ -452,7 +452,7 @@ impl<'a> WhereClause { .collect::>(); match upper_range_clauses.len() { 0 => Ok(None), - 1 => Ok(Some(upper_range_clauses.get(0).unwrap())), + 1 => Ok(Some(upper_range_clauses.first().unwrap())), _ => Err(Error::Query(QuerySyntaxError::MultipleRangeClauses( "there can only at most one range clause with a lower bound", ))), @@ -507,7 +507,7 @@ impl<'a> WhereClause { let in_clause = match in_clauses_array.len() { 0 => Ok(None), 1 => { - let clause = in_clauses_array.get(0).expect("there must be a value"); + let clause = in_clauses_array.first().expect("there must be a value"); if known_fields.contains(&clause.field) { Err(Error::Query( QuerySyntaxError::DuplicateNonGroupableClauseSameField( @@ -637,7 +637,7 @@ impl<'a> WhereClause { } } } else if non_groupable_range_clauses.len() == 1 && groupable_range_clauses.is_empty() { - let where_clause = *non_groupable_range_clauses.get(0).unwrap(); + let where_clause = *non_groupable_range_clauses.first().unwrap(); if where_clause.operator == StartsWith { // Starts with must null be against an empty string if let Value::Text(text) = &where_clause.value { @@ -689,7 +689,7 @@ impl<'a> WhereClause { } let left_key = document_type.serialize_value_for_key( self.field.as_str(), - in_values.get(0).unwrap(), + in_values.first().unwrap(), platform_version, )?; let right_key = document_type.serialize_value_for_key( @@ -1232,7 +1232,7 @@ mod tests { let where_clauses = vec![ WhereClause { field: "a".to_string(), - operator: *query_pair.get(0).unwrap(), + operator: *query_pair.first().unwrap(), value: Value::Float(0.0), }, WhereClause { @@ -1258,7 +1258,7 @@ mod tests { let where_clauses = vec![ WhereClause { field: "a".to_string(), - operator: *query_pair.get(0).unwrap(), + operator: *query_pair.first().unwrap(), value: Value::Float(1.0), }, WhereClause { @@ -1280,7 +1280,7 @@ mod tests { let where_clauses = vec![ WhereClause { field: "a".to_string(), - operator: *query_pair.get(0).unwrap(), + operator: *query_pair.first().unwrap(), value: Value::Float(1.0), }, WhereClause { @@ -1331,7 +1331,7 @@ mod tests { let where_clauses = vec![ WhereClause { field: "a".to_string(), - operator: *query_pair.get(0).unwrap(), + operator: *query_pair.first().unwrap(), value: Value::Float(0.0), }, WhereClause { diff --git a/packages/rs-drive/src/query/mod.rs b/packages/rs-drive/src/query/mod.rs index 0529cedbe32..7f3f9f0d01d 100644 --- a/packages/rs-drive/src/query/mod.rs +++ b/packages/rs-drive/src/query/mod.rs @@ -214,7 +214,7 @@ impl InternalClauses { 0 => Ok(None), 1 => Ok(Some( primary_key_equal_clauses_array - .get(0) + .first() .expect("there must be a value") .clone(), )), @@ -229,7 +229,7 @@ impl InternalClauses { 0 => Ok(None), 1 => Ok(Some( primary_key_in_clauses_array - .get(0) + .first() .expect("there must be a value") .clone(), )), @@ -652,7 +652,7 @@ impl<'a> DriveQuery<'a> { // Should ideally iterate over each statement let first_statement = statements - .get(0) + .first() .ok_or(Error::Query(QuerySyntaxError::InvalidSQL( "Issue parsing sql", )))?; @@ -703,7 +703,7 @@ impl<'a> DriveQuery<'a> { // Get the document type from the 'from' section let document_type_name = match &select .from - .get(0) + .first() .ok_or(Error::Query(QuerySyntaxError::InvalidSQL( "Invalid query: missing from section", )))? @@ -714,7 +714,7 @@ impl<'a> DriveQuery<'a> { alias: _, args: _, with_hints: _, - } => name.0.get(0).as_ref().map(|identifier| &identifier.value), + } => name.0.first().as_ref().map(|identifier| &identifier.value), _ => None, } .ok_or(Error::Query(QuerySyntaxError::InvalidSQL( diff --git a/packages/rs-drive/src/query/ordering.rs b/packages/rs-drive/src/query/ordering.rs index eb033ce14de..d671e909ed7 100644 --- a/packages/rs-drive/src/query/ordering.rs +++ b/packages/rs-drive/src/query/ordering.rs @@ -52,7 +52,7 @@ impl<'a> OrderClause { } let field_value = clause_components - .get(0) + .first() .expect("check above enforces it exists"); let field_ref = field_value.as_text().ok_or(Error::InvalidQuery( "first field of where component should be a string", diff --git a/packages/rs-drive/src/query/test_index.rs b/packages/rs-drive/src/query/test_index.rs index 16413d72c29..c66862fbb73 100644 --- a/packages/rs-drive/src/query/test_index.rs +++ b/packages/rs-drive/src/query/test_index.rs @@ -134,7 +134,7 @@ mod tests { let index = query .find_best_index(platform_version) .expect("expected to find index"); - assert_eq!(index, document_type.indices().get(0).unwrap()); + assert_eq!(index, document_type.indices().first().unwrap()); } #[test] diff --git a/packages/rs-platform-value/src/converter/serde_json.rs b/packages/rs-platform-value/src/converter/serde_json.rs index f064c831d4b..bdd8025569b 100644 --- a/packages/rs-platform-value/src/converter/serde_json.rs +++ b/packages/rs-platform-value/src/converter/serde_json.rs @@ -435,7 +435,7 @@ mod tests { .expect("expected to get array slice") .unwrap(); assert_eq!(array.len(), 1); - assert!(array.get(0).unwrap().is_map()); + assert!(array.first().unwrap().is_map()); let array = value .get_optional_array_slice("disablePublicKeys") .expect("expected to get array slice") diff --git a/packages/rs-platform-value/src/value_serialization/de.rs b/packages/rs-platform-value/src/value_serialization/de.rs index 34ab78ec228..e64a6fffa4e 100644 --- a/packages/rs-platform-value/src/value_serialization/de.rs +++ b/packages/rs-platform-value/src/value_serialization/de.rs @@ -453,7 +453,7 @@ impl<'de> de::Deserializer<'de> for Deserializer { } Value::EnumString(x) => { let variant_name = x - .get(0) + .first() .ok_or_else(|| de::Error::invalid_length(0, &"at least one variant expected"))? .clone(); visitor.visit_enum(variant_name.into_deserializer()) diff --git a/packages/strategy-tests/src/lib.rs b/packages/strategy-tests/src/lib.rs index d48daf02d69..8d27bcebc0a 100644 --- a/packages/strategy-tests/src/lib.rs +++ b/packages/strategy-tests/src/lib.rs @@ -82,7 +82,7 @@ pub mod transitions; /// /// # Note /// Ensure that when using or updating the `Strategy`, all associated operations, identities, and contracts are coherent with the intended workflow or simulation. Inconsistencies might lead to unexpected behaviors or simulation failures. -#[derive(Clone, Debug, PartialEq)] +#[derive(Clone, Debug, PartialEq, Default)] pub struct Strategy { pub contracts_with_updates: Vec<( CreatedDataContract, @@ -94,18 +94,6 @@ pub struct Strategy { pub signer: Option, } -impl Default for Strategy { - fn default() -> Self { - Strategy { - contracts_with_updates: vec![], - operations: vec![], - start_identities: vec![], - identities_inserts: Frequency::default(), - signer: None, - } - } -} - #[derive(Clone, Debug, Encode, Decode)] struct StrategyInSerializationFormat { pub contracts_with_updates: Vec<(Vec, Option>>)>, From 3f602abacf171c26422cd3ffdd87cbf637aec093 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 9 Feb 2024 05:58:49 +0700 Subject: [PATCH 2/3] minor fixes --- packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs | 2 ++ .../pool_withdrawals_into_transactions_queue/v0/mod.rs | 1 + .../data_triggers/triggers/withdrawals/v0/mod.rs | 2 +- packages/rs-drive-abci/src/query/mod.rs | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs b/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs index c5fe042a82a..694c2191465 100644 --- a/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs @@ -14,6 +14,8 @@ use dpp::consensus::basic::decode::SerializedObjectParsingError; use dpp::consensus::basic::BasicError; use dpp::consensus::ConsensusError; +#[cfg(test)] +use crate::execution::validation::state_transition::processor::process_state_transition; use dpp::fee::fee_result::FeeResult; use dpp::serialization::PlatformDeserializable; use dpp::state_transition::StateTransition; diff --git a/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs index 910579e153c..1c01f85ff2d 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/withdrawals/pool_withdrawals_into_transactions_queue/v0/mod.rs @@ -149,6 +149,7 @@ where #[cfg(test)] mod tests { use super::*; + use dpp::block::epoch::Epoch; use dpp::data_contracts::SystemDataContract; use dpp::identifier::Identifier; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs index 38260cc57e4..5a6172dbfab 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs @@ -129,7 +129,7 @@ mod tests { use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::document::serialization_traits::DocumentPlatformConversionMethodsV0; use dpp::document::{Document, DocumentV0Getters}; - use dpp::platform_value::{platform_value, Bytes32}; + use dpp::platform_value::platform_value; use drive::state_transition_action::document::documents_batch::document_transition::document_base_transition_action::{DocumentBaseTransitionAction, DocumentBaseTransitionActionV0}; use drive::state_transition_action::document::documents_batch::document_transition::document_delete_transition_action::DocumentDeleteTransitionAction; use drive::state_transition_action::document::documents_batch::document_transition::document_delete_transition_action::v0::DocumentDeleteTransitionActionV0; diff --git a/packages/rs-drive-abci/src/query/mod.rs b/packages/rs-drive-abci/src/query/mod.rs index 9d3225e6749..a0cc20712f5 100644 --- a/packages/rs-drive-abci/src/query/mod.rs +++ b/packages/rs-drive-abci/src/query/mod.rs @@ -458,7 +458,6 @@ mod tests { mod identity_balance_and_revision { use crate::error::query::QueryError; - use bs58::encode; use dapi_grpc::platform::v0::get_identity_balance_and_revision_request::{ GetIdentityBalanceAndRevisionRequestV0, Version, }; From 06e566dc150ef3a489f832b358b3017776d6b042 Mon Sep 17 00:00:00 2001 From: Quantum Explorer Date: Fri, 9 Feb 2024 06:17:59 +0700 Subject: [PATCH 3/3] more small fixes --- .../core_chain_lock/choose_quorum/v0/mod.rs | 2 +- .../create_mn_shares_contract/mod.rs | 2 +- .../data_contract_update/mod.rs | 2 +- .../documents_batch/data_triggers/mod.rs | 6 +++--- .../data_triggers/triggers/dashpay/v0/mod.rs | 12 ++++++------ .../data_triggers/triggers/dpns/v0/mod.rs | 2 +- .../data_triggers/triggers/withdrawals/v0/mod.rs | 4 ++-- .../rs-drive-abci/src/logging/destination.rs | 2 +- packages/rs-drive-abci/src/query/mod.rs | 4 ++-- .../tests/strategy_tests/masternodes.rs | 16 ++++++---------- .../src/drive/batch/grovedb_op_batch/mod.rs | 4 ++-- .../contract/prove/prove_contract/v0/mod.rs | 2 +- .../v0/mod.rs | 4 +--- .../v0/mod.rs | 4 +--- packages/rs-sdk/tests/fetch/config.rs | 2 +- 15 files changed, 30 insertions(+), 38 deletions(-) diff --git a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs index 2fe7283a1c3..0d8ac563e34 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/core_chain_lock/choose_quorum/v0/mod.rs @@ -90,7 +90,7 @@ impl Platform { #[cfg(test)] mod tests { use crate::platform_types::platform::Platform; - use crate::rpc::core::{CoreRPCLike, MockCoreRPCLike}; + use crate::rpc::core::MockCoreRPCLike; use dashcore_rpc::dashcore_rpc_json::QuorumType; use dpp::bls_signatures::PublicKey as BlsPublicKey; use dpp::dashcore::hashes::Hash; diff --git a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/create_mn_shares_contract/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/create_mn_shares_contract/mod.rs index 213b9ac0dad..e0a2e2306f8 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/create_mn_shares_contract/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/fee_pool_outwards_distribution/create_mn_shares_contract/mod.rs @@ -21,7 +21,7 @@ impl Platform { platform_version: &PlatformVersion, ) -> DataContract { let contract = - load_system_data_contract(SystemDataContract::MasternodeRewards, &platform_version) + load_system_data_contract(SystemDataContract::MasternodeRewards, platform_version) .expect("should load masternode reward contract"); let storage_flags = Some(Cow::Owned(StorageFlags::SingleEpoch(0))); diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs index cd571da9b82..e555f1436a9 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/data_contract_update/mod.rs @@ -486,7 +486,7 @@ mod tests { StateError::DataContractConfigUpdateError, 1 ); - let error = errors.get(0).expect("to have an error"); + let error = errors.first().expect("to have an error"); assert_eq!( error.additional_message(), "contract can not change whether it keeps history: changing from true to false" diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/mod.rs index 0cc6304e022..9920418f531 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/mod.rs @@ -1,7 +1,7 @@ use dpp::validation::SimpleValidationResult; -///! Data triggers implement custom validation logic for state transitions -///! that modifies documents in a specific data contract. -///! Data triggers can be assigned based on the data contract ID, document type, and action. +/// Data triggers implement custom validation logic for state transitions +/// that modifies documents in a specific data contract. +/// Data triggers can be assigned based on the data contract ID, document type, and action. use drive::state_transition_action::document::documents_batch::document_transition::DocumentTransitionAction; use crate::error::Error; diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dashpay/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dashpay/v0/mod.rs index feab7c074c8..a4afc463f15 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dashpay/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dashpay/v0/mod.rs @@ -1,4 +1,4 @@ -///! The `dashpay_data_triggers` module contains data triggers specific to the DashPay data contract. +//! The `dashpay_data_triggers` module contains data triggers specific to the DashPay data contract. use crate::error::execution::ExecutionError; use crate::error::Error; use crate::platform_types::platform_state::v0::PlatformStateV0Methods; @@ -180,7 +180,7 @@ mod test { vec![(contact_request_document, document_type, Bytes32::default())], )]); let document_transition = document_transitions - .get(0) + .first() .expect("document transition should be present"); let document_create_transition = document_transition @@ -267,7 +267,7 @@ mod test { vec![(contact_request_document, document_type, Bytes32::default())], )]); let document_transition = document_transitions - .get(0) + .first() .expect("document transition should be present"); let document_create_transition = document_transition @@ -316,7 +316,7 @@ mod test { assert!(matches!( &result.errors.first().unwrap(), &DataTriggerError::DataTriggerConditionError(e) if { - e.message() == &format!("Identity {owner_id} must not be equal to owner id") + e.message() == format!("Identity {owner_id} must not be equal to owner id") } )); } @@ -379,7 +379,7 @@ mod test { vec![(contact_request_document, document_type, Bytes32::default())], )]); let document_transition = document_transitions - .get(0) + .first() .expect("document transition should be present"); let document_create_transition = document_transition @@ -414,7 +414,7 @@ mod test { assert!(matches!( data_trigger_error, DataTriggerError::DataTriggerConditionError(e) if { - e.message() == &format!("Identity {contract_request_to_user_id} doesn't exist") + e.message() == format!("Identity {contract_request_to_user_id} doesn't exist") } )); } diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dpns/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dpns/v0/mod.rs index 419f9b1c9f5..dcd5f5163e5 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dpns/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/dpns/v0/mod.rs @@ -416,7 +416,7 @@ mod test { DocumentTransitionActionType::Create, vec![(document, document_type, Bytes32::default())], )]); - let first_transition = transitions.get(0).expect("transition should be present"); + let first_transition = transitions.first().expect("transition should be present"); let document_create_transition = first_transition .as_transition_create() diff --git a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs index 5a6172dbfab..add92187165 100644 --- a/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/validation/state_transition/state_transitions/documents_batch/data_triggers/triggers/withdrawals/v0/mod.rs @@ -201,7 +201,7 @@ mod tests { let platform_version = PlatformVersion::first(); let data_contract = - load_system_data_contract(SystemDataContract::Withdrawals, &platform_version) + load_system_data_contract(SystemDataContract::Withdrawals, platform_version) .expect("to load system data contract"); let owner_id = data_contract.owner_id(); @@ -253,7 +253,7 @@ mod tests { .expect("should return a platform version"); let data_contract = - load_system_data_contract(SystemDataContract::Withdrawals, &platform_version) + load_system_data_contract(SystemDataContract::Withdrawals, platform_version) .expect("to load system data contract"); let owner_id = data_contract.owner_id(); diff --git a/packages/rs-drive-abci/src/logging/destination.rs b/packages/rs-drive-abci/src/logging/destination.rs index 200a2b538d2..26f5e3c070b 100644 --- a/packages/rs-drive-abci/src/logging/destination.rs +++ b/packages/rs-drive-abci/src/logging/destination.rs @@ -219,7 +219,7 @@ impl LogDestinationWriter { } LogDestinationWriter::RotationWriter(w) => { let paths = w.0.lock().unwrap().log_paths(); - let path = paths.get(0).expect("exactly one path excepted"); + let path = paths.first().expect("exactly one path excepted"); fs::read_to_string(path).unwrap() } _ => todo!(), diff --git a/packages/rs-drive-abci/src/query/mod.rs b/packages/rs-drive-abci/src/query/mod.rs index a0cc20712f5..6bc247b75b9 100644 --- a/packages/rs-drive-abci/src/query/mod.rs +++ b/packages/rs-drive-abci/src/query/mod.rs @@ -368,7 +368,7 @@ mod tests { mod identity_balance { use crate::error::query::QueryError; - use bs58::encode; + use dapi_grpc::platform::v0::get_identity_balance_request::{ GetIdentityBalanceRequestV0, Version, }; @@ -1710,7 +1710,7 @@ mod tests { ContractRequest, DocumentRequest, IdentityRequest, }; use dapi_grpc::platform::v0::get_proofs_request::{GetProofsRequestV0, Version}; - use dapi_grpc::platform::v0::{get_proofs_response, GetProofsRequest, GetProofsResponse}; + use dapi_grpc::platform::v0::{GetProofsRequest, GetProofsResponse}; use dapi_grpc::platform::VersionedGrpcResponse; use prost::Message; diff --git a/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs b/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs index 75acbf8a117..d240752a265 100644 --- a/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs +++ b/packages/rs-drive-abci/tests/strategy_tests/masternodes.rs @@ -486,18 +486,14 @@ pub fn generate_test_masternodes( SocketAddr::new(IpAddr::V4(random_ip), old_port); } if update.p2p_port { - hpmn_list_item_b - .state - .platform_p2p_port - .as_mut() - .map(|port| *port += 1); + if let Some(port) = hpmn_list_item_b.state.platform_p2p_port.as_mut() { + *port += 1 + } } if update.http_port { - hpmn_list_item_b - .state - .platform_http_port - .as_mut() - .map(|port| *port += 1); + if let Some(port) = hpmn_list_item_b.state.platform_http_port.as_mut() { + *port += 1 + } } latest_masternode_list_item = hpmn_list_item_b.clone(); diff --git a/packages/rs-drive/src/drive/batch/grovedb_op_batch/mod.rs b/packages/rs-drive/src/drive/batch/grovedb_op_batch/mod.rs index 215fd9bfe7e..9c16b1ff611 100644 --- a/packages/rs-drive/src/drive/batch/grovedb_op_batch/mod.rs +++ b/packages/rs-drive/src/drive/batch/grovedb_op_batch/mod.rs @@ -277,7 +277,7 @@ impl GroveDbOpBatchV0Methods for GroveDbOpBatch { if let Some(index) = self .operations .iter() - .position(|op| &op.path == &path && op.key == KeyInfo::KnownKey(key.to_vec())) + .position(|op| op.path == path && op.key == KeyInfo::KnownKey(key.to_vec())) { Some(self.operations.remove(index).op) } else { @@ -307,7 +307,7 @@ impl GroveDbOpBatchV0Methods for GroveDbOpBatch { if let Some(index) = self .operations .iter() - .position(|op| &op.path == &path && op.key == KeyInfo::KnownKey(key.to_vec())) + .position(|op| op.path == path && op.key == KeyInfo::KnownKey(key.to_vec())) { let op = &self.operations[index].op; let op = if matches!( diff --git a/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs b/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs index a80e7bc13ab..cf0af397345 100644 --- a/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs +++ b/packages/rs-drive/src/drive/contract/prove/prove_contract/v0/mod.rs @@ -50,7 +50,7 @@ impl Drive { ); match result { Ok(_) => Ok(contract_proof), - Err(Error::GroveDB(grovedb::Error::WrongElementType(s))) if s == "expected an item" => { + Err(Error::GroveDB(grovedb::Error::WrongElementType("expected an item"))) => { // In this case we are trying to prove a historical type contract let contract_query = Self::fetch_contract_with_history_latest_query(contract_id, true); diff --git a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity_by_unique_public_key_hash/v0/mod.rs b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity_by_unique_public_key_hash/v0/mod.rs index 1c0362898ca..51a3f8f3efd 100644 --- a/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity_by_unique_public_key_hash/v0/mod.rs +++ b/packages/rs-drive/src/drive/identity/fetch/prove/prove_full_identity_by_unique_public_key_hash/v0/mod.rs @@ -80,9 +80,7 @@ mod tests { .find(|public_key| public_key.key_type().is_unique_key_type()) .expect("expected a unique key") .hash() - .expect("expected to hash data") - .try_into() - .expect("expected to be 20 bytes"); + .expect("expected to hash data"); let proof = drive .prove_full_identity_by_unique_public_key_hash(first_key_hash, None, platform_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 34d5e219be4..38ba9a005c1 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 @@ -61,9 +61,7 @@ mod tests { .find(|public_key| public_key.key_type().is_unique_key_type()) .expect("expected a unique key") .hash() - .expect("expected to hash data") - .try_into() - .expect("expected to be 20 bytes"); + .expect("expected to hash data"); let proof = drive .prove_identity_id_by_unique_public_key_hash_v0( diff --git a/packages/rs-sdk/tests/fetch/config.rs b/packages/rs-sdk/tests/fetch/config.rs index cc4d7e956e6..20d17bdaece 100644 --- a/packages/rs-sdk/tests/fetch/config.rs +++ b/packages/rs-sdk/tests/fetch/config.rs @@ -69,7 +69,7 @@ pub struct Config { impl Config { /// Prefix of configuration options in the environment variables and `.env` file. - pub const CONFIG_PREFIX: &str = "RS_SDK_"; + pub const CONFIG_PREFIX: &'static str = "RS_SDK_"; /// Load configuration from operating system environment variables and `.env` file. /// /// Create new [Config] with data from environment variables and `${CARGO_MANIFEST_DIR}/tests/.env` file.