diff --git a/packages/wasm-dpp/src/document/document_facade.rs b/packages/wasm-dpp/src/document/document_facade.rs index a62fe8a083..005b1b4223 100644 --- a/packages/wasm-dpp/src/document/document_facade.rs +++ b/packages/wasm-dpp/src/document/document_facade.rs @@ -1,9 +1,9 @@ -use std::rc::Rc; -use wasm_bindgen::{prelude::*, JsValue}; -use dpp::fee::Credits; -use dpp::identifier::Identifier; use crate::document::factory::DocumentFactoryWASM; use crate::{DataContractWasm, ExtendedDocumentWasm}; +use dpp::fee::Credits; +use dpp::identifier::Identifier; +use std::rc::Rc; +use wasm_bindgen::{prelude::*, JsValue}; use crate::document::state_transition::document_batch_transition::DocumentsBatchTransitionWasm; use crate::identifier::IdentifierWrapper; @@ -99,7 +99,7 @@ impl DocumentFacadeWasm { documents: &JsValue, nonce_counter_value: &js_sys::Object, //IdentityID/ContractID -> nonce, recipient: Option, - price: Option + price: Option, ) -> Result { self.factory .create_state_transition(documents, nonce_counter_value, recipient, price) diff --git a/packages/wasm-dpp/src/document/errors/mod.rs b/packages/wasm-dpp/src/document/errors/mod.rs index f900fde35d..3b3b2018d3 100644 --- a/packages/wasm-dpp/src/document/errors/mod.rs +++ b/packages/wasm-dpp/src/document/errors/mod.rs @@ -79,7 +79,7 @@ pub fn from_document_to_js_error(e: DocumentError) -> JsValue { DocumentError::InvalidActionError(action) => InvalidActionError::new(action.into()).into(), DocumentError::TryingToDeleteIndelibleDocument { document } => { TryingToDeleteImmutableDocumentError::new((*document).into()).into() - }, + } DocumentError::TryingToTransferNonTransferableDocument { document } => { TryingToTransferNonTransferableDocumentError::new((*document).into()).into() } diff --git a/packages/wasm-dpp/src/document/extended_document.rs b/packages/wasm-dpp/src/document/extended_document.rs index a321e5f46b..8fd0f7c8de 100644 --- a/packages/wasm-dpp/src/document/extended_document.rs +++ b/packages/wasm-dpp/src/document/extended_document.rs @@ -1,4 +1,6 @@ -use dpp::document::{DocumentV0Getters, DocumentV0Setters, ExtendedDocument, EXTENDED_DOCUMENT_IDENTIFIER_FIELDS}; +use dpp::document::{ + DocumentV0Getters, DocumentV0Setters, ExtendedDocument, EXTENDED_DOCUMENT_IDENTIFIER_FIELDS, +}; use serde_json::Value as JsonValue; use dpp::platform_value::{Bytes32, Value}; diff --git a/packages/wasm-dpp/src/document/factory.rs b/packages/wasm-dpp/src/document/factory.rs index a6724bdc6c..80aaa3f2ca 100644 --- a/packages/wasm-dpp/src/document/factory.rs +++ b/packages/wasm-dpp/src/document/factory.rs @@ -13,19 +13,19 @@ use dpp::document::Document; use dpp::prelude::ExtendedDocument; -use dpp::identifier::Identifier; -use dpp::state_transition::documents_batch_transition::document_transition::action_type::DocumentTransitionActionType; -use dpp::version::PlatformVersion; -use std::convert::TryFrom; -use dpp::fee::Credits; use crate::document_batch_transition::DocumentsBatchTransitionWasm; use crate::entropy_generator::ExternalEntropyGenerator; +use crate::identifier::IdentifierWrapper; use crate::{ identifier::identifier_from_js_value, utils::{IntoWasm, ToSerdeJSONExt, WithJsError}, DataContractWasm, ExtendedDocumentWasm, }; -use crate::identifier::IdentifierWrapper; +use dpp::fee::Credits; +use dpp::identifier::Identifier; +use dpp::state_transition::documents_batch_transition::document_transition::action_type::DocumentTransitionActionType; +use dpp::version::PlatformVersion; +use std::convert::TryFrom; #[wasm_bindgen(js_name=DocumentTransitions)] #[derive(Debug, Default)] @@ -111,7 +111,7 @@ impl DocumentFactoryWASM { documents: &JsValue, nonce_counter_value: &js_sys::Object, //IdentityID/ContractID -> nonce recipient: Option, - price: Option + price: Option, ) -> Result { let mut nonce_counter = BTreeMap::new(); let mut contract_ids_to_check = HashSet::<&Identifier>::new(); @@ -179,7 +179,12 @@ impl DocumentFactoryWASM { let batch_transition = self .0 - .create_state_transition(documents, &mut nonce_counter, recipient.map(|e| { Identifier::from(e)}), price) + .create_state_transition( + documents, + &mut nonce_counter, + recipient.map(|e| Identifier::from(e)), + price, + ) .with_js_error()?; Ok(batch_transition.into()) @@ -282,14 +287,18 @@ fn extract_documents_by_action( let documents_replace = extract_documents_of_action(documents, "replace").with_js_error()?; let documents_delete = extract_documents_of_action(documents, "delete").with_js_error()?; let documents_transfer = extract_documents_of_action(documents, "transfer").with_js_error()?; - let documents_update_price = extract_documents_of_action(documents, "updatePrice").with_js_error()?; + let documents_update_price = + extract_documents_of_action(documents, "updatePrice").with_js_error()?; let documents_purchase = extract_documents_of_action(documents, "purchase").with_js_error()?; documents_by_action.insert(DocumentTransitionActionType::Create, documents_create); documents_by_action.insert(DocumentTransitionActionType::Replace, documents_replace); documents_by_action.insert(DocumentTransitionActionType::Delete, documents_delete); documents_by_action.insert(DocumentTransitionActionType::Transfer, documents_transfer); - documents_by_action.insert(DocumentTransitionActionType::UpdatePrice, documents_update_price); + documents_by_action.insert( + DocumentTransitionActionType::UpdatePrice, + documents_update_price, + ); documents_by_action.insert(DocumentTransitionActionType::Purchase, documents_purchase); Ok(documents_by_action)