Skip to content

Commit

Permalink
refactor: simplify Promise interactions
Browse files Browse the repository at this point in the history
  • Loading branch information
davidyuk committed Feb 8, 2025
1 parent 9b411dc commit 4050793
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
6 changes: 3 additions & 3 deletions src/lib/rpc.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ export default class RpcPeer {
this.#handlers = handlers;
}

processMessage(message) {
async processMessage(message) {
if (message.type === REQUEST_CANCEL) {
const controller = this.#responseControllers[message.id];
if (!controller) {
this.#send({ id: message.id, error: 'Can\'t cancel request: its abort controller not found' });
return Promise.resolve();
return undefined;
}
controller.abort();
return Promise.resolve();
return undefined;
}
return [NOTIFICATION, REQUEST].includes(message.type)
? this.#processRequestMessage(message)
Expand Down
4 changes: 3 additions & 1 deletion src/store/modules/accounts/airGap.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,9 @@ export default {
dispatch('router/push', { name: 'vault-setup-method' }, { root: true });
},

sign: () => Promise.reject(new Error('Not implemented yet')),
sign: () => {
throw new Error('Not implemented yet');
},

signTransactionByDeepLink({ commit }, requestUrl) {
if (process.env.VUE_APP_CORDOVA) {
Expand Down
4 changes: 3 additions & 1 deletion src/store/modules/accounts/ledger.js
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,9 @@ export default {
}
},

sign: () => Promise.reject(new Error('Not implemented yet')),
sign: () => {
throw new Error('Not implemented yet');
},

async signTransaction({ rootGetters, dispatch, rootState: { sdk } }, { transaction, signal }) {
await dispatch('ensureCurrentAccountAvailable');
Expand Down
4 changes: 2 additions & 2 deletions src/store/plugins/reverseIframe.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ export default (store) => {
namespaced: true,
actions: {
open(_, { name, ...props }) {
if (!modals[name]) return Promise.reject(new Error(`Modal with name "${name}" not registered`));
if (!modals[name]) throw new Error(`Modal with name "${name}" not registered`);
const popupWindow = window.open('/', 'popup', 'width=530,height=730');
if (!popupWindow) return Promise.reject(new Error('Can\'t show popup window'));
if (!popupWindow) throw new Error('Can\'t show popup window');
popupWindow.modalName = name;
return new Promise((resolve, reject) => {
popupWindow.modalProps = { ...props, resolve, reject };
Expand Down
2 changes: 1 addition & 1 deletion src/store/plugins/ui/modals.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default (store) => {
},
actions: {
open({ commit }, { name, signal, allowRedirect, ...props }) {
if (!modals[name]) return Promise.reject(new Error(`Modal with name "${name}" not registered`));
if (!modals[name]) throw new Error(`Modal with name "${name}" not registered`);
const key = Symbol(`modal-${name}-${Date.now() % 1e4}`);
let abort;
return new Promise((resolve, reject) => {
Expand Down
2 changes: 1 addition & 1 deletion src/store/plugins/ui/names.js
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export default (store) => {
async updatePointer({
rootState, state, commit, dispatch,
}, { name, address }) {
const sdk = await Promise.resolve(rootState.sdk);
const sdk = await rootState.sdk;
const nameEntry = await sdk.api.getNameEntryByName(name);
await sdk.aensUpdate(
name,
Expand Down

0 comments on commit 4050793

Please sign in to comment.