Merge branch 'develop' into ruslan/packages

Emurgo · May 6, 2024 · d51fa98 · d51fa98
2 parents 2e0c6c8 + 17e6eea
commit d51fa98
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/packages/yoroi-extension/app/api/ada/index.js b/packages/yoroi-extension/app/api/ada/index.js
@@ -856,7 +856,7 @@ export default class AdaApi {
   async createUnsignedTxForUtxos(
     request: CreateUnsignedTxForUtxosRequest
   ): Promise<CreateUnsignedTxForUtxosResponse> {
-    Logger.debug(`${nameof(AdaApi)}::${nameof(this.createUnsignedTxForUtxos)} called`);
+    Logger.debug('AdaApi.createUnsignedTxForUtxos called');
     try {
       const config = getCardanoHaskellBaseConfig(
         request.network
@@ -868,7 +868,7 @@ export default class AdaApi {
 
       if (hasSendAllDefault(request.tokens)) {
         if (request.receivers.length !== 1) {
-          throw new Error(`${nameof(this.createUnsignedTxForUtxos)} wrong output size for sendAll`);
+          throw new Error('AdaApi.createUnsignedTxForUtxos wrong output size for sendAll');
         }
         const receiver = request.receivers[0];
         unsignedTxResponse = shelleySendAllUnsignedTx(
@@ -902,7 +902,7 @@ export default class AdaApi {
           ([]: Array<{| ...Address, ...Addressing |}>)
         );
         if (changeAddresses.length !== 1) {
-          throw new Error(`${nameof(this.createUnsignedTxForUtxos)} needs exactly one change address`);
+          throw new Error('AdaApi.createUnsignedTxForUtxos needs exactly one change address');
         }
         const changeAddr = changeAddresses[0];
         const otherAddresses: Array<{| ...Address, |}> = request.receivers.reduce(
@@ -916,7 +916,7 @@ export default class AdaApi {
           ([]: Array<{| ...Address, |}>)
         );
         if (otherAddresses.length > 1) {
-          throw new Error(`${nameof(this.createUnsignedTxForUtxos)} can't send to more than one address`);
+          throw new Error('AdaApi.createUnsignedTxForUtxos can\'t send to more than one address');
         }
         unsignedTxResponse = await shelleyNewAdaUnsignedTx(
           otherAddresses.length === 1
@@ -950,7 +950,7 @@ export default class AdaApi {
         );
       }
       Logger.debug(
-        `${nameof(AdaApi)}::${nameof(this.createUnsignedTxForUtxos)} success: ` + stringifyData(unsignedTxResponse)
+        'AdaApi.createUnsignedTxForUtxos success: ' + stringifyData(unsignedTxResponse)
       );
       return new HaskellShelleyTxSignRequest({
         senderUtxos: unsignedTxResponse.senderUtxos,
@@ -970,7 +970,7 @@ export default class AdaApi {
       });
     } catch (error) {
       Logger.error(
-        `${nameof(AdaApi)}::${nameof(this.createUnsignedTxForUtxos)} error: ` + stringifyError(error)
+        'AdaApi.createUnsignedTxForUtxos error: ' + stringifyError(error)
       );
       if (error instanceof LocalizableError) throw error;
       throw new GenericApiError();
@@ -1796,11 +1796,11 @@ export default class AdaApi {
   async restoreWallet(
     request: RestoreWalletRequest
   ): Promise<RestoreWalletResponse> {
-    Logger.debug(`${nameof(AdaApi)}::${nameof(this.restoreWallet)} called`);
+    Logger.debug('AdaApi.restoreWallet called');
     const { recoveryPhrase, walletName, walletPassword, } = request;
 
     if (request.accountIndex < HARD_DERIVATION_START) {
-      throw new Error(`${nameof(this.restoreWallet)} needs hardened index`);
+      throw new Error('AdaApi.restoreWallet needs hardened index');
     }
     try {
       // Note: we only restore for 0th account
@@ -1825,12 +1825,12 @@ export default class AdaApi {
           cip1852Wallet,
         ));
       }
-      Logger.debug(`${nameof(AdaApi)}::${nameof(this.restoreWallet)} success`);
+      Logger.debug('AdaApi.restoreWallet success');
       return {
         publicDerivers: newPubDerivers,
       };
     } catch (error) {
-      Logger.error(`${nameof(AdaApi)}::${nameof(this.restoreWallet)} error: ` + stringifyError(error));
+      Logger.error('AdaApi.restoreWallet error: ' + stringifyError(error));
       // TODO: handle case where wallet already exists (this if case is never hit)
       if (error.message != null && error.message.includes('Wallet with that mnemonics already exists')) {
         throw new WalletAlreadyRestoredError();
@@ -1849,7 +1849,7 @@ export default class AdaApi {
   async restoreWalletForTransfer(
     request: RestoreWalletForTransferRequest
   ): Promise<RestoreWalletForTransferResponse> {
-    Logger.debug(`${nameof(AdaApi)}::${nameof(this.restoreWalletForTransfer)} called`);
+    Logger.debug('AdaApi.restoreWalletForTransfer called');
     const { checkAddressesInUse } = request;
 
     const config = getCardanoHaskellBaseConfig(
@@ -1910,7 +1910,7 @@ export default class AdaApi {
           keyDerivationId: i
         });
         const family = reverseAddressLookup.get(i);
-        if (family == null) throw new Error(`${nameof(this.restoreWalletForTransfer)} should never happen`);
+        if (family == null) throw new Error('AdaApi.restoreWalletForTransfer: should never happen');
         const result = family.map(address => ({
           address,
           addressing: {
@@ -1921,13 +1921,13 @@ export default class AdaApi {
         addressResult.push(...result);
       }
 
-      Logger.debug(`${nameof(this.restoreWalletForTransfer)} success`);
+      Logger.debug('AdaApi.restoreWalletForTransfer success');
 
       return {
         addresses: addressResult,
       };
     } catch (error) {
-      Logger.error(`${nameof(this.restoreWalletForTransfer)} error: ` + stringifyError(error));
+      Logger.error('AdaApi.restoreWalletForTransfer error: ' + stringifyError(error));
       // TODO: backend will return something different here, if multiple wallets
       // are restored from the key and if there are duplicate wallets we will get
       // some kind of error and present the user with message that some wallets

diff --git a/packages/yoroi-extension/app/api/ada/index.test.js b/packages/yoroi-extension/app/api/ada/index.test.js
@@ -23,7 +23,7 @@ import type { FilterUsedRequest, FilterUsedResponse } from './lib/state-fetch/ty
 
 let db: lf$Database;
 
-describe.skip('app/api/ada/index', () => {
+describe('app/api/ada/index', () => {
   beforeAll(async () => {
     await RustModule.load();
     db = await loadLovefieldDB(schema.DataStoreType.MEMORY);