Skip to content

Commit 1a2520e

Browse files
committed
fix(wasm-dpp): lint fix
1 parent ccf0921 commit 1a2520e

File tree

4 files changed

+31
-23
lines changed

4 files changed

+31
-23
lines changed

packages/rs-dpp/src/document/document_factory/mod.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ use crate::data_contract::document_type::DocumentTypeRef;
1212
use crate::document::Document;
1313
#[cfg(feature = "extended-document")]
1414
use crate::document::ExtendedDocument;
15+
use crate::fee::Credits;
1516
#[cfg(feature = "state-transitions")]
1617
use crate::state_transition::documents_batch_transition::{
1718
document_transition::action_type::DocumentTransitionActionType, DocumentsBatchTransition,
1819
};
1920
use crate::util::entropy_generator::EntropyGenerator;
2021
pub use v0::DocumentFactoryV0;
21-
use crate::fee::Credits;
2222

2323
/// # Document Factory
2424
///
@@ -125,7 +125,9 @@ impl DocumentFactory {
125125
price: Option<Credits>,
126126
) -> Result<DocumentsBatchTransition, ProtocolError> {
127127
match self {
128-
DocumentFactory::V0(v0) => v0.create_state_transition(documents_iter, nonce_counter, recipient, price),
128+
DocumentFactory::V0(v0) => {
129+
v0.create_state_transition(documents_iter, nonce_counter, recipient, price)
130+
}
129131
}
130132
}
131133

packages/rs-dpp/src/document/document_factory/v0/mod.rs

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@ use crate::document::{
2222
extended_document::v0::ExtendedDocumentV0,
2323
serialization_traits::DocumentPlatformConversionMethodsV0, ExtendedDocument,
2424
};
25+
use crate::fee::Credits;
2526
use crate::prelude::{BlockHeight, CoreBlockHeight, TimestampMillis};
27+
use crate::state_transition::documents_batch_transition::document_transition::{
28+
DocumentPurchaseTransition, DocumentTransferTransition, DocumentUpdatePriceTransition,
29+
};
2630
#[cfg(feature = "state-transitions")]
2731
use crate::state_transition::documents_batch_transition::{
2832
document_transition::{
@@ -32,8 +36,6 @@ use crate::state_transition::documents_batch_transition::{
3236
DocumentsBatchTransition, DocumentsBatchTransitionV0,
3337
};
3438
use itertools::Itertools;
35-
use crate::fee::Credits;
36-
use crate::state_transition::documents_batch_transition::document_transition::{DocumentPurchaseTransition, DocumentTransferTransition, DocumentUpdatePriceTransition};
3739

3840
const PROPERTY_FEATURE_VERSION: &str = "$version";
3941
const PROPERTY_ENTROPY: &str = "$entropy";
@@ -213,7 +215,7 @@ impl DocumentFactoryV0 {
213215
>,
214216
nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce,
215217
recipient: Option<Identifier>,
216-
price: Option<Credits>
218+
price: Option<Credits>,
217219
) -> Result<DocumentsBatchTransition, ProtocolError> {
218220
let platform_version = PlatformVersion::get(self.protocol_version)?;
219221
let documents: Vec<(
@@ -273,17 +275,19 @@ impl DocumentFactoryV0 {
273275
.collect(),
274276
nonce_counter,
275277
platform_version,
276-
recipient
277-
),
278-
DocumentTransitionActionType::UpdatePrice => Self::document_update_price_transitions(
279-
documents
280-
.into_iter()
281-
.map(|(document, document_type, _)| (document, document_type))
282-
.collect(),
283-
nonce_counter,
284-
platform_version,
285-
price
278+
recipient,
286279
),
280+
DocumentTransitionActionType::UpdatePrice => {
281+
Self::document_update_price_transitions(
282+
documents
283+
.into_iter()
284+
.map(|(document, document_type, _)| (document, document_type))
285+
.collect(),
286+
nonce_counter,
287+
platform_version,
288+
price,
289+
)
290+
}
287291
DocumentTransitionActionType::Purchase => Self::document_purchase_transitions(
288292
documents
289293
.into_iter()
@@ -292,14 +296,15 @@ impl DocumentFactoryV0 {
292296
nonce_counter,
293297
platform_version,
294298
price,
295-
recipient
299+
recipient,
296300
),
297301
_ => {
298302
let action_type_name: &str = action.into();
299303

300304
Err(ProtocolError::InvalidStateTransitionType(
301305
action_type_name.to_string(),
302-
))},
306+
))
307+
}
303308
})
304309
.collect::<Result<Vec<_>, ProtocolError>>()?
305310
.into_iter()
@@ -588,7 +593,7 @@ impl DocumentFactoryV0 {
588593
documents: Vec<(Document, DocumentTypeRef)>,
589594
nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce
590595
platform_version: &PlatformVersion,
591-
recipient_owner_id: Option<Identifier>
596+
recipient_owner_id: Option<Identifier>,
592597
) -> Result<Vec<DocumentTransition>, ProtocolError> {
593598
documents
594599
.into_iter()
@@ -635,7 +640,7 @@ impl DocumentFactoryV0 {
635640
documents: Vec<(Document, DocumentTypeRef)>,
636641
nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce
637642
platform_version: &PlatformVersion,
638-
price: Option<Credits>
643+
price: Option<Credits>,
639644
) -> Result<Vec<DocumentTransition>, ProtocolError> {
640645
documents
641646
.into_iter()
@@ -680,7 +685,7 @@ impl DocumentFactoryV0 {
680685
nonce_counter: &mut BTreeMap<(Identifier, Identifier), u64>, //IdentityID/ContractID -> nonce
681686
platform_version: &PlatformVersion,
682687
price: Option<Credits>,
683-
recipient: Option<Identifier>
688+
recipient: Option<Identifier>,
684689
) -> Result<Vec<DocumentTransition>, ProtocolError> {
685690
documents
686691
.into_iter()

packages/rs-dpp/src/state_transition/state_transitions/document/documents_batch_transition/document_transition/action_type.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ impl TryFrom<&str> for DocumentTransitionActionType {
4848
}
4949
}
5050

51-
5251
impl From<DocumentTransitionActionType> for &str {
5352
fn from(value: DocumentTransitionActionType) -> Self {
5453
match value {
@@ -58,7 +57,9 @@ impl From<DocumentTransitionActionType> for &str {
5857
DocumentTransitionActionType::Transfer => "Transfer",
5958
DocumentTransitionActionType::Purchase => "Purchase",
6059
DocumentTransitionActionType::UpdatePrice => "UpdatePrice",
61-
DocumentTransitionActionType::IgnoreWhileBumpingRevision => "IgnoreWhileBumpingRevision"
60+
DocumentTransitionActionType::IgnoreWhileBumpingRevision => {
61+
"IgnoreWhileBumpingRevision"
62+
}
6263
}
6364
}
6465
}

packages/rs-dpp/src/tests/fixtures/get_document_transitions_fixture.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pub fn get_document_transitions_fixture<'a>(
2424
DocumentFactory::new(protocol_version).expect("expected to get document factory");
2525

2626
document_factory
27-
.create_state_transition(documents, nonce_counter)
27+
.create_state_transition(documents, nonce_counter, None, None)
2828
.expect("the transitions should be created")
2929
.transitions()
3030
.to_owned()

0 commit comments

Comments
 (0)