fix: invalid feature flag usage

Author: shumkov

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/mod.rs

@@ -4,21 +4,12 @@ use bincode::{Decode, Encode};
 use derive_more::Display;
 
 pub use super::super::token_base_transition::IDENTIFIER_FIELDS;
-use crate::prelude::{
-    DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryptionKeyIndex, SenderKeyIndex,
-};
 use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition;
+use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
 use platform_value::Identifier;
 #[cfg(feature = "state-transition-serde-conversion")]
 use serde::{Deserialize, Serialize};
 
-pub type SharedEncryptedNote = (SenderKeyIndex, RecipientKeyIndex, Vec<u8>);
-pub type PrivateEncryptedNote = (
-    RootEncryptionKeyIndex,
-    DerivationEncryptionKeyIndex,
-    Vec<u8>,
-);
-
 mod property_names {
     pub const AMOUNT: &str = "$amount";
     pub const RECIPIENT_OWNER_ID: &str = "recipientOwnerId";

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0/v0_methods.rs

@@ -3,7 +3,7 @@ use crate::prelude::{DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryp
 use crate::state_transition::batch_transition::batched_transition::token_transfer_transition::TokenTransferTransitionV0;
 use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors;
 use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition;
-use crate::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
+use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
 
 impl TokenBaseTransitionAccessors for TokenTransferTransitionV0 {
     fn base(&self) -> &TokenBaseTransition {

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/batched_transition/token_transfer_transition/v0_methods.rs

@@ -4,7 +4,7 @@ use crate::state_transition::batch_transition::batched_transition::token_transfe
 use crate::state_transition::batch_transition::token_base_transition::token_base_transition_accessors::TokenBaseTransitionAccessors;
 use crate::state_transition::batch_transition::TokenTransferTransition;
 use crate::state_transition::batch_transition::token_base_transition::TokenBaseTransition;
-use crate::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
+use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
 
 impl TokenBaseTransitionAccessors for TokenTransferTransition {
     fn base(&self) -> &TokenBaseTransition {

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/mod.rs

@@ -20,16 +20,14 @@ use crate::prelude::UserFeeIncrease;
 use crate::state_transition::batch_transition::batched_transition::BatchedTransition;
 use crate::state_transition::batch_transition::methods::v0::DocumentsBatchTransitionMethodsV0;
 use crate::state_transition::batch_transition::methods::v1::DocumentsBatchTransitionMethodsV1;
-use crate::state_transition::batch_transition::token_transfer_transition::{
-    PrivateEncryptedNote, SharedEncryptedNote,
-};
 use crate::state_transition::batch_transition::BatchTransition;
 #[cfg(feature = "state-transition-signing")]
 use crate::state_transition::batch_transition::{BatchTransitionV0, BatchTransitionV1};
 #[cfg(feature = "state-transition-signing")]
 use crate::state_transition::StateTransition;
 #[cfg(feature = "state-transition-signing")]
 use crate::tokens::emergency_action::TokenEmergencyAction;
+use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
 use crate::ProtocolError;
 #[cfg(feature = "state-transition-signing")]
 use platform_value::Identifier;

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/methods/v1/mod.rs

@@ -11,13 +11,11 @@ use crate::identity::IdentityPublicKey;
 #[cfg(feature = "state-transition-signing")]
 use crate::prelude::{IdentityNonce, UserFeeIncrease};
 use crate::state_transition::batch_transition::accessors::DocumentsBatchTransitionAccessorsV0;
-use crate::state_transition::batch_transition::token_transfer_transition::{
-    PrivateEncryptedNote, SharedEncryptedNote,
-};
 #[cfg(feature = "state-transition-signing")]
 use crate::state_transition::StateTransition;
 #[cfg(feature = "state-transition-signing")]
 use crate::tokens::emergency_action::TokenEmergencyAction;
+use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
 #[cfg(feature = "state-transition-signing")]
 use crate::version::FeatureVersion;
 #[cfg(feature = "state-transition-signing")]

packages/rs-dpp/src/state_transition/state_transitions/document/batch_transition/v1/v0_methods.rs

@@ -71,13 +71,12 @@ use crate::state_transition::batch_transition::token_freeze_transition::TokenFre
 #[cfg(feature = "state-transition-signing")]
 use crate::state_transition::batch_transition::token_mint_transition::TokenMintTransitionV0;
 #[cfg(feature = "state-transition-signing")]
-use crate::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
-#[cfg(feature = "state-transition-signing")]
 use crate::state_transition::batch_transition::token_transfer_transition::TokenTransferTransitionV0;
 #[cfg(feature = "state-transition-signing")]
 use crate::state_transition::batch_transition::token_unfreeze_transition::TokenUnfreezeTransitionV0;
 #[cfg(feature = "state-transition-signing")]
 use crate::tokens::emergency_action::TokenEmergencyAction;
+use crate::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
 
 impl DocumentsBatchTransitionAccessorsV0 for BatchTransitionV1 {
     type IterType<'a>

packages/rs-dpp/src/tokens/mod.rs

@@ -1,4 +1,7 @@
 use crate::data_contract::TokenContractPosition;
+use crate::prelude::{
+    DerivationEncryptionKeyIndex, RecipientKeyIndex, RootEncryptionKeyIndex, SenderKeyIndex,
+};
 use crate::util::hash::hash_double;
 
 pub mod allowed_currency;
@@ -8,6 +11,13 @@ pub mod info;
 pub mod status;
 pub mod token_event;
 
+pub type SharedEncryptedNote = (SenderKeyIndex, RecipientKeyIndex, Vec<u8>);
+pub type PrivateEncryptedNote = (
+    RootEncryptionKeyIndex,
+    DerivationEncryptionKeyIndex,
+    Vec<u8>,
+);
+
 pub fn calculate_token_id(contract_id: &[u8; 32], token_pos: TokenContractPosition) -> [u8; 32] {
     let mut bytes = b"dash_token".to_vec();
     bytes.extend_from_slice(contract_id);

packages/rs-dpp/src/tokens/token_event.rs

@@ -21,8 +21,8 @@ pub type TokenEventPersonalEncryptedNote = Option<(
     Vec<u8>,
 )>;
 use crate::serialization::PlatformSerializableWithPlatformVersion;
-use crate::state_transition::batch_transition::token_transfer_transition::SharedEncryptedNote;
 use crate::tokens::emergency_action::TokenEmergencyAction;
+use crate::tokens::SharedEncryptedNote;
 use crate::ProtocolError;
 
 pub type RecipientIdentifier = Identifier;

packages/rs-drive-abci/src/execution/check_tx/v0/mod.rs

@@ -630,7 +630,7 @@ mod tests {
             )
             .expect("expected to process state transition");
 
-        assert_eq!(processing_result.aggregated_fees().processing_fee, 2484410);
+        assert_eq!(processing_result.aggregated_fees().processing_fee, 2484810);
 
         let check_result = platform
             .check_tx(
@@ -1141,7 +1141,7 @@ mod tests {
 
         // The processing fees should be twice as much as a fee multiplier of 0,
         // since a fee multiplier of 100 means 100% more of 1 (gives 2)
-        assert_eq!(processing_result.aggregated_fees().processing_fee, 4968820);
+        assert_eq!(processing_result.aggregated_fees().processing_fee, 4969620);
 
         let check_result = platform
             .check_tx(
@@ -1613,7 +1613,7 @@ mod tests {
             )
             .expect("expected to process state transition");
 
-        assert_eq!(processing_result.aggregated_fees().processing_fee, 2484410);
+        assert_eq!(processing_result.aggregated_fees().processing_fee, 2484810);
 
         platform
             .drive
@@ -2069,7 +2069,7 @@ mod tests {
             )
             .expect("expected to process state transition");
 
-        assert_eq!(processing_result.aggregated_fees().processing_fee, 2484410);
+        assert_eq!(processing_result.aggregated_fees().processing_fee, 2484810);
 
         platform
             .drive

packages/rs-drive/src/state_transition_action/batch/batched_transition/token_transition/token_transfer_transition_action/mod.rs

@@ -3,7 +3,7 @@ use derive_more::From;
 use crate::state_transition_action::batch::batched_transition::token_transition::token_base_transition_action::TokenBaseTransitionAction;
 use dpp::identifier::Identifier;
 use dpp::prelude::{DerivationEncryptionKeyIndex, RootEncryptionKeyIndex};
-use dpp::state_transition::batch_transition::token_transfer_transition::{PrivateEncryptedNote, SharedEncryptedNote};
+use dpp::tokens::{PrivateEncryptedNote, SharedEncryptedNote};
 
 /// transformer module
 pub mod transformer;