diff --git a/packages/rs-dpp/src/document/document_factory/mod.rs b/packages/rs-dpp/src/document/document_factory/mod.rs index 8245a079f3c..b8aa2f56e9b 100644 --- a/packages/rs-dpp/src/document/document_factory/mod.rs +++ b/packages/rs-dpp/src/document/document_factory/mod.rs @@ -12,13 +12,13 @@ use crate::data_contract::document_type::DocumentTypeRef; use crate::document::Document; #[cfg(feature = "extended-document")] use crate::document::ExtendedDocument; +use crate::fee::Credits; #[cfg(feature = "state-transitions")] use crate::state_transition::documents_batch_transition::{ document_transition::action_type::DocumentTransitionActionType, DocumentsBatchTransition, }; use crate::util::entropy_generator::EntropyGenerator; pub use v0::DocumentFactoryV0; -use crate::fee::Credits; /// # Document Factory /// @@ -125,7 +125,9 @@ impl DocumentFactory { price: Option, ) -> Result { match self { - DocumentFactory::V0(v0) => v0.create_state_transition(documents_iter, nonce_counter, recipient, price), + DocumentFactory::V0(v0) => { + v0.create_state_transition(documents_iter, nonce_counter, recipient, price) + } } } diff --git a/packages/rs-dpp/src/document/document_factory/v0/mod.rs b/packages/rs-dpp/src/document/document_factory/v0/mod.rs index 36ed8e1e480..efca3e23801 100644 --- a/packages/rs-dpp/src/document/document_factory/v0/mod.rs +++ b/packages/rs-dpp/src/document/document_factory/v0/mod.rs @@ -22,7 +22,11 @@ use crate::document::{ extended_document::v0::ExtendedDocumentV0, serialization_traits::DocumentPlatformConversionMethodsV0, ExtendedDocument, }; +use crate::fee::Credits; use crate::prelude::{BlockHeight, CoreBlockHeight, TimestampMillis}; +use crate::state_transition::documents_batch_transition::document_transition::{ + DocumentPurchaseTransition, DocumentTransferTransition, DocumentUpdatePriceTransition, +}; #[cfg(feature = "state-transitions")] use crate::state_transition::documents_batch_transition::{ document_transition::{ @@ -32,8 +36,6 @@ use crate::state_transition::documents_batch_transition::{ DocumentsBatchTransition, DocumentsBatchTransitionV0, }; use itertools::Itertools; -use crate::fee::Credits; -use crate::state_transition::documents_batch_transition::document_transition::{DocumentPurchaseTransition, DocumentTransferTransition, DocumentUpdatePriceTransition}; const PROPERTY_FEATURE_VERSION: &str = "$version"; const PROPERTY_ENTROPY: &str = "$entropy"; @@ -213,7 +215,7 @@ impl DocumentFactoryV0 { >, nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce, recipient: Option, - price: Option + price: Option, ) -> Result { let platform_version = PlatformVersion::get(self.protocol_version)?; let documents: Vec<( @@ -273,17 +275,19 @@ impl DocumentFactoryV0 { .collect(), nonce_counter, platform_version, - recipient - ), - DocumentTransitionActionType::UpdatePrice => Self::document_update_price_transitions( - documents - .into_iter() - .map(|(document, document_type, _)| (document, document_type)) - .collect(), - nonce_counter, - platform_version, - price + recipient, ), + DocumentTransitionActionType::UpdatePrice => { + Self::document_update_price_transitions( + documents + .into_iter() + .map(|(document, document_type, _)| (document, document_type)) + .collect(), + nonce_counter, + platform_version, + price, + ) + } DocumentTransitionActionType::Purchase => Self::document_purchase_transitions( documents .into_iter() @@ -292,14 +296,15 @@ impl DocumentFactoryV0 { nonce_counter, platform_version, price, - recipient + recipient, ), _ => { let action_type_name: &str = action.into(); Err(ProtocolError::InvalidStateTransitionType( action_type_name.to_string(), - ))}, + )) + } }) .collect::, ProtocolError>>()? .into_iter() @@ -588,7 +593,7 @@ impl DocumentFactoryV0 { documents: Vec<(Document, DocumentTypeRef)>, nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce platform_version: &PlatformVersion, - recipient_owner_id: Option + recipient_owner_id: Option, ) -> Result, ProtocolError> { documents .into_iter() @@ -635,7 +640,7 @@ impl DocumentFactoryV0 { documents: Vec<(Document, DocumentTypeRef)>, nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce platform_version: &PlatformVersion, - price: Option + price: Option, ) -> Result, ProtocolError> { documents .into_iter() @@ -680,7 +685,7 @@ impl DocumentFactoryV0 { nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce platform_version: &PlatformVersion, price: Option, - recipient: Option + recipient: Option, ) -> Result, ProtocolError> { documents .into_iter() diff --git a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/action_type.rs b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/action_type.rs index fb4cf51ccf1..afc2943983f 100644 --- a/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/action_type.rs +++ b/packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/action_type.rs @@ -48,7 +48,6 @@ impl TryFrom<&str> for DocumentTransitionActionType { } } - impl From for &str { fn from(value: DocumentTransitionActionType) -> Self { match value { @@ -58,7 +57,9 @@ impl From for &str { DocumentTransitionActionType::Transfer => "Transfer", DocumentTransitionActionType::Purchase => "Purchase", DocumentTransitionActionType::UpdatePrice => "UpdatePrice", - DocumentTransitionActionType::IgnoreWhileBumpingRevision => "IgnoreWhileBumpingRevision" + DocumentTransitionActionType::IgnoreWhileBumpingRevision => { + "IgnoreWhileBumpingRevision" + } } } } diff --git a/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs b/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs index dfb531b5546..9c78a2b2e6e 100644 --- a/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs +++ b/packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs @@ -24,7 +24,7 @@ pub fn get_document_transitions_fixture<'a>( DocumentFactory::new(protocol_version).expect("expected to get document factory"); document_factory - .create_state_transition(documents, nonce_counter) + .create_state_transition(documents, nonce_counter, None, None) .expect("the transitions should be created") .transitions() .to_owned()