chore: fix merge errors

dashpay · Apr 4, 2023 · 834bd21 · 834bd21
1 parent 07fb3e2
commit 834bd21
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/.../state_transition/identity_update_transition/validate_identity_update_transition_state.rs b/.../state_transition/identity_update_transition/validate_identity_update_transition_state.rs
@@ -11,12 +11,7 @@ use crate::consensus::state::identity::identity_public_key_is_read_only_error::I
 use crate::consensus::state::identity::invalid_identity_public_key_id_error::InvalidIdentityPublicKeyIdError;
 use crate::consensus::state::identity::invalid_identity_revision_error::InvalidIdentityRevisionError;
 use crate::consensus::state::state_error::StateError;
-use crate::consensus::ConsensusError::StateError;
 use crate::identity::state_transition::identity_update_transition::IdentityUpdateTransitionAction;
-use crate::StateError::{
-    IdentityPublicKeyIsDisabledError, IdentityPublicKeyIsReadOnlyError,
-    InvalidIdentityPublicKeyIdError, InvalidIdentityRevisionError,
-};
 use crate::{
     block_time_window::validate_time_in_block_time_window::validate_time_in_block_time_window,
     identity::validation::{RequiredPurposeAndSecurityLevelValidator, TPublicKeysValidator},