Skip to content

Commit 548e6b2

Browse files
fixes
1 parent a968131 commit 548e6b2

File tree

3 files changed

+12
-5
lines changed
  • packages
    • rs-dpp/src/document/serialization_traits/platform_serialization_conversion
    • wasm-dpp/src

3 files changed

+12
-5
lines changed

packages/rs-dpp/src/document/serialization_traits/platform_serialization_conversion/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ mod tests {
110110
use crate::data_contract::accessors::v0::DataContractV0Getters;
111111
use crate::data_contract::document_type::random_document::CreateRandomDocument;
112112
use crate::document::serialization_traits::DocumentPlatformConversionMethodsV0;
113-
use crate::document::{Document, DocumentV0Setters};
113+
use crate::document::Document;
114114
use crate::tests::json_document::json_document_to_contract;
115-
use platform_value::Value;
116115
use platform_version::version::PlatformVersion;
117116

118117
#[test]

packages/wasm-dpp/src/document/state_transition/batch_transition/document_transition/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use wasm_bindgen::prelude::*;
1919
use dpp::fee::Credits;
2020
use dpp::platform_value::converter::serde_json::BTreeValueJsonConverter;
2121
use dpp::prelude::Revision;
22-
use dpp::state_transition::batch_transition::document_base_transition::DocumentBaseTransition;
2322
use dpp::state_transition::batch_transition::document_replace_transition::v0::v0_methods::DocumentReplaceTransitionV0Methods;
2423
use dpp::state_transition::batch_transition::batched_transition::document_purchase_transition::v0::v0_methods::DocumentPurchaseTransitionV0Methods;
2524
use dpp::state_transition::batch_transition::batched_transition::document_transfer_transition::v0::v0_methods::DocumentTransferTransitionV0Methods;

packages/wasm-dpp/src/errors/consensus/consensus_error.rs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ use dpp::consensus::state::data_trigger::DataTriggerError::{
6161
DataTriggerConditionError, DataTriggerExecutionError, DataTriggerInvalidResultError,
6262
};
6363
use wasm_bindgen::{JsError, JsValue};
64-
use dpp::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, DataContractTokenConfigurationUpdateError, GroupExceedsMaxMembersError, GroupMemberHasPowerOfZeroError, GroupMemberHasPowerOverLimitError, GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError, GroupPositionDoesNotExistError, GroupTotalPowerLessThanRequiredError, InvalidDocumentTypeRequiredSecurityLevelError, InvalidTokenBaseSupplyError, InvalidTokenDistributionFunctionDivideByZeroError, InvalidTokenDistributionFunctionIncoherenceError, InvalidTokenDistributionFunctionInvalidParameterError, InvalidTokenDistributionFunctionInvalidParameterTupleError, NonContiguousContractGroupPositionsError, NonContiguousContractTokenPositionsError, UnknownDocumentCreationRestrictionModeError, UnknownGasFeesPaidByError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError};
64+
use dpp::consensus::basic::data_contract::{ContestedUniqueIndexOnMutableDocumentTypeError, ContestedUniqueIndexWithUniqueIndexError, DataContractTokenConfigurationUpdateError, GroupExceedsMaxMembersError, GroupMemberHasPowerOfZeroError, GroupMemberHasPowerOverLimitError, GroupNonUnilateralMemberPowerHasLessThanRequiredPowerError, GroupPositionDoesNotExistError, GroupTotalPowerLessThanRequiredError, InvalidDocumentTypeRequiredSecurityLevelError, InvalidTokenBaseSupplyError, InvalidTokenDistributionFunctionDivideByZeroError, InvalidTokenDistributionFunctionIncoherenceError, InvalidTokenDistributionFunctionInvalidParameterError, InvalidTokenDistributionFunctionInvalidParameterTupleError, NonContiguousContractGroupPositionsError, NonContiguousContractTokenPositionsError, TokenPaymentByBurningOnlyAllowedOnInternalTokenError, UnknownDocumentActionTokenEffectError, UnknownDocumentCreationRestrictionModeError, UnknownGasFeesPaidByError, UnknownSecurityLevelError, UnknownStorageKeyRequirementsError, UnknownTradeModeError, UnknownTransferableTypeError};
6565
use dpp::consensus::basic::document::{ContestedDocumentsTemporarilyNotAllowedError, DocumentCreationNotAllowedError, DocumentFieldMaxSizeExceededError, MaxDocumentsTransitionsExceededError, MissingPositionsInDocumentTypePropertiesError};
6666
use dpp::consensus::basic::group::GroupActionNotAllowedOnTransitionError;
6767
use dpp::consensus::basic::identity::{DataContractBoundsNotPresentError, DisablingKeyIdAlsoBeingAddedInSameTransitionError, InvalidIdentityCreditWithdrawalTransitionAmountError, InvalidIdentityUpdateTransitionDisableKeysError, InvalidIdentityUpdateTransitionEmptyError, TooManyMasterPublicKeyError, WithdrawalOutputScriptNotAllowedWhenSigningWithOwnerKeyError};
@@ -84,7 +84,7 @@ use dpp::consensus::state::identity::no_transfer_key_for_core_withdrawal_availab
8484
use dpp::consensus::state::identity::RecipientIdentityDoesNotExistError;
8585
use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_insufficient_error::PrefundedSpecializedBalanceInsufficientError;
8686
use dpp::consensus::state::prefunded_specialized_balances::prefunded_specialized_balance_not_found_error::PrefundedSpecializedBalanceNotFoundError;
87-
use dpp::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountNotFrozenError, IdentityTokenAccountFrozenError, TokenIsPausedError, IdentityTokenAccountAlreadyFrozenError, UnauthorizedTokenActionError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, TokenMintPastMaxSupplyError, NewTokensDestinationIdentityDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, InvalidGroupPositionError, TokenAlreadyPausedError, TokenNotPausedError, InvalidTokenClaimPropertyMismatch, InvalidTokenClaimNoCurrentRewards, InvalidTokenClaimWrongClaimant, TokenTransferRecipientIdentityNotExistError, PreProgrammedDistributionTimestampInPastError, IdentityHasNotAgreedToPayRequiredTokenAmountError, RequiredTokenPaymentInfoNotSetError};
87+
use dpp::consensus::state::token::{IdentityDoesNotHaveEnoughTokenBalanceError, IdentityTokenAccountNotFrozenError, IdentityTokenAccountFrozenError, TokenIsPausedError, IdentityTokenAccountAlreadyFrozenError, UnauthorizedTokenActionError, TokenSettingMaxSupplyToLessThanCurrentSupplyError, TokenMintPastMaxSupplyError, NewTokensDestinationIdentityDoesNotExistError, NewAuthorizedActionTakerIdentityDoesNotExistError, NewAuthorizedActionTakerGroupDoesNotExistError, NewAuthorizedActionTakerMainGroupNotSetError, InvalidGroupPositionError, TokenAlreadyPausedError, TokenNotPausedError, InvalidTokenClaimPropertyMismatch, InvalidTokenClaimNoCurrentRewards, InvalidTokenClaimWrongClaimant, TokenTransferRecipientIdentityNotExistError, PreProgrammedDistributionTimestampInPastError, IdentityHasNotAgreedToPayRequiredTokenAmountError, RequiredTokenPaymentInfoNotSetError, IdentityTryingToPayWithWrongTokenError};
8888
use dpp::consensus::state::voting::masternode_incorrect_voter_identity_id_error::MasternodeIncorrectVoterIdentityIdError;
8989
use dpp::consensus::state::voting::masternode_incorrect_voting_address_error::MasternodeIncorrectVotingAddressError;
9090
use dpp::consensus::state::voting::masternode_not_found_error::MasternodeNotFoundError;
@@ -396,6 +396,9 @@ pub fn from_state_error(state_error: &StateError) -> JsValue {
396396
StateError::RequiredTokenPaymentInfoNotSetError(e) => {
397397
generic_consensus_error!(RequiredTokenPaymentInfoNotSetError, e).into()
398398
}
399+
StateError::IdentityTryingToPayWithWrongTokenError(e) => {
400+
generic_consensus_error!(IdentityTryingToPayWithWrongTokenError, e).into()
401+
}
399402
}
400403
}
401404

@@ -752,6 +755,12 @@ fn from_basic_error(basic_error: &BasicError) -> JsValue {
752755
BasicError::UnknownGasFeesPaidByError(e) => {
753756
generic_consensus_error!(UnknownGasFeesPaidByError, e).into()
754757
}
758+
BasicError::UnknownDocumentActionTokenEffectError(e) => {
759+
generic_consensus_error!(UnknownDocumentActionTokenEffectError, e).into()
760+
}
761+
BasicError::TokenPaymentByBurningOnlyAllowedOnInternalTokenError(e) => {
762+
generic_consensus_error!(TokenPaymentByBurningOnlyAllowedOnInternalTokenError, e).into()
763+
}
755764
}
756765
}
757766

0 commit comments

Comments
 (0)