diff --git a/packages/rs-drive-abci/src/execution/platform_events/block_fee_processing/process_block_fees/v0/mod.rs b/packages/rs-drive-abci/src/execution/platform_events/block_fee_processing/process_block_fees/v0/mod.rs index 3b482ffb38..986460807e 100644 --- a/packages/rs-drive-abci/src/execution/platform_events/block_fee_processing/process_block_fees/v0/mod.rs +++ b/packages/rs-drive-abci/src/execution/platform_events/block_fee_processing/process_block_fees/v0/mod.rs @@ -237,10 +237,10 @@ mod tests { use crate::execution::types::block_state_info::v0::BlockStateInfoV0; use crate::platform_types::epoch_info::v0::EpochInfoV0; use crate::platform_types::epoch_info::EpochInfo; + use crate::platform_types::platform_state::v0::PlatformStateV0Methods; use crate::platform_types::platform_state::PlatformState; use dpp::fee::epoch::{perpetual_storage_epochs, CreditsPerEpoch, GENESIS_EPOCH_INDEX}; use drive::drive::defaults::INITIAL_PROTOCOL_VERSION; - use crate::platform_types::platform_state::v0::PlatformStateV0Methods; /// Process and validate block fees pub fn process_and_validate_block_fees( @@ -302,7 +302,9 @@ mod tests { }; let block_execution_context_clone = block_execution_context.clone(); - let previous_fee_versions = block_execution_context_clone.block_platform_state().previous_fee_versions(); + let previous_fee_versions = block_execution_context_clone + .block_platform_state() + .previous_fee_versions(); let storage_fee_distribution_outcome = platform .process_block_fees_v0( &block_execution_context.into(), diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/contract.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/contract.rs index 71e1063056..c3baa30f2f 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/contract.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/contract.rs @@ -11,7 +11,7 @@ use crate::drive::batch::drive_op_batch::finalize_task::{ }; use crate::error::drive::DriveError; use dpp::data_contract::accessors::v0::DataContractV0Getters; -use dpp::prelude::CachedEpochIndexFeeVersions; + use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; 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 0638e71eae..99f5cb5388 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 @@ -12,7 +12,7 @@ use dpp::data_contract::accessors::v0::DataContractV0Getters; use dpp::data_contract::document_type::DocumentTypeRef; use dpp::data_contract::DataContract; use dpp::document::Document; -use dpp::prelude::{CachedEpochIndexFeeVersions, Identifier}; +use dpp::prelude::Identifier; use dpp::system_data_contracts::withdrawals_contract::v1::document_types::withdrawal; diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs index fbef12132a..d3346034dd 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/mod.rs @@ -8,7 +8,6 @@ use dpp::block::block_info::BlockInfo; use dpp::version::PlatformVersion; -use dpp::prelude::CachedEpochIndexFeeVersions; use grovedb::TransactionArg; impl Drive { diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs index 2bf5b5a239..fa50fcc460 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/drive_methods/convert_drive_operations_to_grove_operations/v0/mod.rs @@ -6,7 +6,6 @@ use crate::error::Error; use crate::fee::op::LowLevelDriveOperation; use dpp::block::block_info::BlockInfo; -use dpp::prelude::CachedEpochIndexFeeVersions; use dpp::version::PlatformVersion; use grovedb::batch::GroveDbOp; use grovedb::TransactionArg; diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/identity.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/identity.rs index 1ac431862a..78416eb878 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/identity.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/identity.rs @@ -4,7 +4,7 @@ use crate::error::Error; use crate::fee::op::LowLevelDriveOperation; use dpp::block::block_info::BlockInfo; use dpp::identity::{Identity, IdentityPublicKey, KeyID}; -use dpp::prelude::{CachedEpochIndexFeeVersions, IdentityNonce, Revision}; +use dpp::prelude::{IdentityNonce, Revision}; use crate::drive::identity::update::methods::merge_identity_nonce::MergeIdentityContractNonceResultToResult; use dpp::version::PlatformVersion; diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/mod.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/mod.rs index 6ad8543689..e8c817ca02 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/mod.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/mod.rs @@ -33,7 +33,7 @@ use crate::drive::batch::drive_op_batch::finalize_task::{ DriveOperationFinalizationTasks, DriveOperationFinalizeTask, }; use crate::error::drive::DriveError; -use dpp::prelude::CachedEpochIndexFeeVersions; + use std::collections::{BTreeMap, HashMap}; /// A converter that will get Drive Operations from High Level Operations diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/system.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/system.rs index 2296c3cdb2..f2ac99ba67 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/system.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/system.rs @@ -7,7 +7,7 @@ use dpp::fee::Credits; use dpp::platform_value::Bytes36; use dpp::asset_lock::reduced_asset_lock_value::AssetLockValue; -use dpp::prelude::CachedEpochIndexFeeVersions; + use dpp::version::PlatformVersion; use grovedb::batch::KeyInfoPath; use grovedb::{EstimatedLayerInformation, TransactionArg}; diff --git a/packages/rs-drive/src/drive/batch/drive_op_batch/withdrawals.rs b/packages/rs-drive/src/drive/batch/drive_op_batch/withdrawals.rs index e989a56297..cc1569f0b4 100644 --- a/packages/rs-drive/src/drive/batch/drive_op_batch/withdrawals.rs +++ b/packages/rs-drive/src/drive/batch/drive_op_batch/withdrawals.rs @@ -11,7 +11,7 @@ use crate::drive::identity::withdrawals::{ use crate::drive::object_size_info::PathKeyElementInfo; use crate::{drive::Drive, error::Error, fee::op::LowLevelDriveOperation}; use dpp::block::block_info::BlockInfo; -use dpp::prelude::CachedEpochIndexFeeVersions; + use dpp::version::PlatformVersion; use grovedb::Element; use grovedb::{batch::KeyInfoPath, EstimatedLayerInformation, TransactionArg}; diff --git a/packages/rs-platform-version/src/version/fee/hashing/mod.rs b/packages/rs-platform-version/src/version/fee/hashing/mod.rs index 8759aee4e6..a5ec109ef8 100644 --- a/packages/rs-platform-version/src/version/fee/hashing/mod.rs +++ b/packages/rs-platform-version/src/version/fee/hashing/mod.rs @@ -9,7 +9,6 @@ pub struct FeeHashingVersion { pub sha256_per_block: u64, pub sha256_ripe_md160_base: u64, pub single_sha256_base: u64, - } impl PartialEq for FeeHashingVersion { fn eq(&self, other: &Self) -> bool { diff --git a/packages/rs-platform-version/src/version/fee/signature/mod.rs b/packages/rs-platform-version/src/version/fee/signature/mod.rs index f6d472d370..06a872dad0 100644 --- a/packages/rs-platform-version/src/version/fee/signature/mod.rs +++ b/packages/rs-platform-version/src/version/fee/signature/mod.rs @@ -47,4 +47,4 @@ mod tests { // This assertion will check if all fields are considered in the equality comparison assert_eq!(version1, version2, "FeeSignatureVersion equality test failed. If a field was added or removed, update the Eq implementation."); } -} \ No newline at end of file +} diff --git a/packages/rs-platform-version/src/version/fee/storage/mod.rs b/packages/rs-platform-version/src/version/fee/storage/mod.rs index ce4ce3b90c..5ba6a1cc90 100644 --- a/packages/rs-platform-version/src/version/fee/storage/mod.rs +++ b/packages/rs-platform-version/src/version/fee/storage/mod.rs @@ -47,4 +47,4 @@ mod tests { // This assertion will check if all fields are considered in the equality comparison assert_eq!(version1, version2, "FeeStorageVersion equality test failed. If a field was added or removed, update the Eq implementation."); } -} \ No newline at end of file +}