refactor: disableActions retrieval ordering and error throwing

linear-protocol · Mar 25, 2022 · 3c78e65 · 3c78e65
1 parent 329492c
commit 3c78e65
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 21 deletions.
diff --git a/lib/account_multisig.js b/lib/account_multisig.js
diff --git a/src/account_multisig.ts b/src/account_multisig.ts
@@ -316,17 +316,11 @@ export class Account2FA extends AccountMultisig {
 
     async disableWithFAK({ contractBytes, cleanupContractBytes }: { contractBytes: Uint8Array, cleanupContractBytes?: Uint8Array }) {
         let cleanupActions = [];
-        const keyConversionActions = await this.get2faDisableKeyConversionActions();
         if(cleanupContractBytes) {
-            let deleteAllRequestsError;
-            await this.deleteAllRequests().catch(e => deleteAllRequestsError = e);
-            cleanupActions = await this.get2faDisableCleanupActions(cleanupContractBytes).catch(e => {
-                if(e.type === 'ContractHasExistingState') {
-                    throw deleteAllRequestsError || e;
-                }
-                throw e;
-            });
+            await this.deleteAllRequests().catch(e => e);
+            cleanupActions = await this.get2faDisableCleanupActions(cleanupContractBytes);
         }
+        const keyConversionActions = await this.get2faDisableKeyConversionActions();
 
         const actions = [
             ...cleanupActions,