Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,10 @@ use dpp::state_transition::batch_transition::document_create_transition::Documen

use dpp::document::INITIAL_REVISION;

use dpp::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods;
use dpp::state_transition::documents_batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods;
use dpp::state_transition::batch_transition::document_create_transition::v0::v0_methods::DocumentCreateTransitionV0Methods;
use wasm_bindgen::prelude::*;
use dpp::state_transition::batch_transition::document_base_transition::document_base_transition_trait::DocumentBaseTransitionAccessors;
use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods;

#[wasm_bindgen(js_name=DocumentCreateTransition)]
#[derive(Debug, Clone)]
Expand Down Expand Up @@ -90,11 +91,11 @@ impl DocumentCreateTransitionWasm {

#[wasm_bindgen(js_name=getIdentityContractNonce)]
pub fn get_identity_contract_nonce(&self) -> u64 {
self.inner.base().identity_contract_nonce() as u64
self.inner.base().identity_contract_nonce()
}

#[wasm_bindgen(js_name=setIdentityContractNonce)]
pub fn set_identity_contract_nonce(&mut self, identity_contract_nonce: u64) -> () {
pub fn set_identity_contract_nonce(&mut self, identity_contract_nonce: u64) {
let mut base = self.inner.base().clone();

base.set_identity_contract_nonce(identity_contract_nonce);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use dpp::state_transition::documents_batch_transition::{
use dpp::state_transition::batch_transition::{
document_delete_transition, DocumentDeleteTransition,
};

Expand All @@ -10,9 +10,9 @@ use crate::{
document::document_batch_transition::document_transition::to_object,
identifier::IdentifierWrapper, utils::WithJsError,
};
use dpp::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods;
use dpp::state_transition::documents_batch_transition::document_delete_transition::v0::v0_methods::DocumentDeleteTransitionV0Methods;
use dpp::state_transition::documents_batch_transition::document_transition::action_type::DocumentTransitionActionType;
use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods;
use dpp::state_transition::batch_transition::document_delete_transition::v0::v0_methods::DocumentDeleteTransitionV0Methods;
use dpp::state_transition::batch_transition::document_transition::action_type::DocumentTransitionActionType;

#[wasm_bindgen(js_name=DocumentDeleteTransition)]
#[derive(Debug, Clone)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,15 @@ use std::convert::TryInto;

use serde_json::Value as JsonValue;

use dpp::data_contract::accessors::v0::DataContractV0Getters;
use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters;
use dpp::platform_value::btreemap_extensions::{
BTreeValueMapHelper, BTreeValueMapPathHelper, BTreeValueMapReplacementPathHelper,
};
use dpp::platform_value::ReplacementType;
use dpp::prelude::Revision;
use dpp::state_transition::batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods;
use dpp::state_transition::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods;
use dpp::{
prelude::{DataContract, Identifier},
state_transition::documents_batch_transition::{
Expand All @@ -18,10 +22,6 @@ use dpp::{
};
use serde::Serialize;
use wasm_bindgen::prelude::*;
use dpp::data_contract::accessors::v0::DataContractV0Getters;
use dpp::data_contract::document_type::accessors::DocumentTypeV0Getters;
use dpp::state_transition::documents_batch_transition::document_base_transition::v0::v0_methods::DocumentBaseTransitionV0Methods;
use dpp::state_transition::documents_batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods;

use crate::{
buffer::Buffer,
Expand All @@ -31,7 +31,7 @@ use crate::{
utils::{ToSerdeJSONExt, WithJsError},
BinaryType, DataContractWasm,
};
use dpp::state_transition::documents_batch_transition::document_transition::action_type::DocumentTransitionActionType;
use dpp::state_transition::batch_transition::document_transition::action_type::DocumentTransitionActionType;

#[wasm_bindgen(js_name=DocumentReplaceTransition)]
#[derive(Debug, Clone)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@ use serde_json::Value as JsonValue;
use wasm_bindgen::prelude::*;
use dpp::fee::Credits;
use dpp::platform_value::converter::serde_json::BTreeValueJsonConverter;
use dpp::state_transition::documents_batch_transition::document_base_transition::DocumentBaseTransition;
use dpp::state_transition::documents_batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods;
use dpp::state_transition::documents_batch_transition::document_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods;
use dpp::state_transition::documents_batch_transition::document_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods;
use dpp::state_transition::documents_batch_transition::document_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods;
use dpp::state_transition::batch_transition::document_base_transition::DocumentBaseTransition;
use dpp::state_transition::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods;
use dpp::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods;
use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods;
use dpp::state_transition::batch_transition::batched_transition::document_update_price_transition::v0::v0_methods::DocumentUpdatePriceTransitionV0Methods;
use crate::{
buffer::Buffer,
identifier::{identifier_from_js_value, IdentifierWrapper},
Expand Down Expand Up @@ -62,10 +62,10 @@ impl DocumentTransitionWasm {
.serialize(&serde_wasm_bindgen::Serializer::json_compatible())
.unwrap()
}
DocumentTransition::Delete(document_delete_transition) => JsValue::null(),
DocumentTransition::Transfer(document_transfer_transition) => JsValue::null(),
DocumentTransition::UpdatePrice(document_update_price_transition) => JsValue::null(),
DocumentTransition::Purchase(document_purchase_transition) => JsValue::null(),
DocumentTransition::Delete(_) => JsValue::null(),
DocumentTransition::Transfer(_) => JsValue::null(),
DocumentTransition::UpdatePrice(_) => JsValue::null(),
DocumentTransition::Purchase(_) => JsValue::null(),
}
}

Expand Down Expand Up @@ -109,7 +109,7 @@ impl DocumentTransitionWasm {
#[wasm_bindgen(js_name=get_price)]
pub fn get_price(&self) -> Option<Credits> {
match &self.0 {
DocumentTransition::Create(create) => None,
DocumentTransition::Create(_) => None,
DocumentTransition::Replace(_) => None,
DocumentTransition::Delete(_) => None,
DocumentTransition::Transfer(_) => None,
Expand All @@ -121,12 +121,12 @@ impl DocumentTransitionWasm {
#[wasm_bindgen(js_name=getReceiverId)]
pub fn get_receiver_id(&self) -> Option<IdentifierWrapper> {
match &self.0 {
DocumentTransition::Create(create) => None,
DocumentTransition::Create(_) => None,
DocumentTransition::Replace(_) => None,
DocumentTransition::Delete(_) => None,
DocumentTransition::Transfer(transfer) => Some(transfer.recipient_owner_id().into()),
DocumentTransition::UpdatePrice(update_price) => None,
DocumentTransition::Purchase(purchase) => None,
DocumentTransition::UpdatePrice(_) => None,
DocumentTransition::Purchase(_) => None,
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const {
ExtendedDocument,
DataContract,
ValidationResult,
DocumentsBatchTransition,
BatchTransition,
DashPlatformProtocol,
DataContractNotPresentError,
} = require('../../..');
Expand Down Expand Up @@ -95,7 +95,7 @@ describe('DocumentFacade', () => {
});

describe('createStateTransition', () => {
it('should create DocumentsBatchTransition with passed documents - Rust', () => {
it('should create BatchTransition with passed documents - Rust', () => {
const identityId = documents[0].getOwnerId();
const contractId = documents[0].getDataContractId();

Expand All @@ -107,7 +107,7 @@ describe('DocumentFacade', () => {
},
});

expect(result).to.be.instanceOf(DocumentsBatchTransition);
expect(result).to.be.instanceOf(BatchTransition);
// expect(result.getTransitions().map((t) => t.toObject()))
// .has.deep.members(getDocumentTransitionsFixture({
// create: documentsJs,
Expand Down
Loading