feat(encryption): refactor circular dependencies on services

packages/snjs/lib/Services/KeyRecovery/KeyRecoveryOperation.ts

@@ -1,10 +1,10 @@
 import { ContentType } from '@standardnotes/common'
 import { ItemsKeyInterface } from '@standardnotes/models'
 import { dateSorted } from '@standardnotes/utils'
-import { SNRootKeyParams, DecryptItemsKeyByPromptingUser, EncryptionProvider } from '@standardnotes/encryption'
+import { SNRootKeyParams, EncryptionProvider } from '@standardnotes/encryption'
 import { DecryptionQueueItem, KeyRecoveryOperationResult } from './Types'
 import { serverKeyParamsAreSafe } from './Utils'
-import { ChallengeServiceInterface } from '@standardnotes/services'
+import { ChallengeServiceInterface, DecryptItemsKeyByPromptingUser } from '@standardnotes/services'
 import { ItemManager } from '../Items'
 
 export class KeyRecoveryOperation {

packages/snjs/lib/Services/KeyRecovery/KeyRecoveryService.ts

@@ -1,11 +1,5 @@
 import { KeyRecoveryOperation } from './KeyRecoveryOperation'
-import {
-  SNRootKeyParams,
-  EncryptionService,
-  SNRootKey,
-  KeyParamsFromApiResponse,
-  KeyRecoveryStrings,
-} from '@standardnotes/encryption'
+import { SNRootKeyParams, SNRootKey, KeyParamsFromApiResponse, KeyRecoveryStrings } from '@standardnotes/encryption'
 import { UserService } from '../User/UserService'
 import {
   isErrorDecryptingPayload,
@@ -37,6 +31,7 @@ import {
   ChallengeValidation,
   ChallengeReason,
   ChallengePrompt,
+  EncryptionService,
 } from '@standardnotes/services'
 import {
   UndecryptableItemsStorage,