fix: refactoring

XRPL-Labs · Mar 14, 2024 · 64a807e · 64a807e
1 parent 03e98f3
commit 64a807e
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 17 deletions.
diff --git a/src/common/libs/ledger/mixin/Mutations.mixin.ts b/src/common/libs/ledger/mixin/Mutations.mixin.ts
@@ -15,14 +15,10 @@ import { HookExecution } from '@common/libs/ledger/types/common';
 
 /* Types ==================================================================== */
 import { Constructor, MutationsMixinType } from './types';
-import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
 
 /* Mixin ==================================================================== */
 export function MutationsMixin<TBase extends Constructor>(Base: TBase) {
     return class extends Base implements MutationsMixinType {
-        JsonForSigning!: TransactionJson;
-        MetaData!: TransactionMetadata | Record<string, never>;
-
         private BalanceChanges: Map<string, any>;
         private OwnerCountChanges: Map<string, any>;
         private HookExecutions: HookExecution[];

diff --git a/src/common/libs/ledger/mixin/Sign.mixin.ts b/src/common/libs/ledger/mixin/Sign.mixin.ts
@@ -19,14 +19,10 @@ import { TransactionResult } from '@common/libs/ledger/parser/types';
 import { SignableTransaction } from '@common/libs/ledger/transactions/types';
 
 import { Constructor, SignMethodType, SignMixinType } from './types';
-import { TransactionJson, TransactionMetadata } from '@common/libs/ledger/types/transaction';
 
 /* Mixin ==================================================================== */
 export function SignMixin<TBase extends Constructor>(Base: TBase) {
     return class extends Base implements SignMixinType {
-        JsonForSigning!: TransactionJson;
-        MetaData!: TransactionMetadata | Record<string, never>;
-
         private _submitResult?: SubmitResultType;
         private _verifyResult?: VerifyResultType;
         private isAborted?: boolean;

diff --git a/src/common/libs/ledger/objects/__tests__/base.test.ts b/src/common/libs/ledger/objects/__tests__/base.test.ts
@@ -1,7 +1,7 @@
 /* eslint-disable spellcheck/spell-checker */
 /* eslint-disable max-len */
 
-import BaseLedgerObject from '../BaseLedgerObject';
+import BaseLedgerObject from '../base';
 
 jest.mock('@services/LedgerService');
 jest.mock('@services/NetworkService');

diff --git a/src/common/libs/ledger/transactions/common.ts b/src/common/libs/ledger/transactions/common.ts
@@ -79,6 +79,11 @@ export abstract class BaseTransaction {
     declare AccountTxnID?: FieldReturnType<typeof Hash256>;
     declare PreviousTxnID?: FieldReturnType<typeof Hash256>;
 
-    abstract get JsonForSigning(): TransactionJson;
-    abstract get MetaData(): TransactionMetadata | Record<string, never>;
+    get JsonForSigning(): TransactionJson {
+        throw new Error('Method JsonForSigning not implemented.');
+    }
+
+    get MetaData(): TransactionMetadata | Record<string, never> {
+        throw new Error('Method MetaData not implemented.');
+    }
 }
diff --git a/src/common/libs/ledger/transactions/genuine/__tests__/base.test.ts b/src/common/libs/ledger/transactions/genuine/__tests__/base.test.ts
@@ -1,7 +1,7 @@
 import { TransactionTypes } from '@common/libs/ledger/types/enums';
 import Memo from '@common/libs/ledger/parser/common/memo';
 
-import BaseGenuineTransaction from '../BaseGenuineTransaction';
+import BaseGenuineTransaction from '../base';
 
 import BaseTxTemplate from './fixtures/BaseTx.json';
 
@@ -96,7 +96,7 @@ describe('BaseGenuineTransaction', () => {
             };
 
             const transaction = new BaseGenuineTransaction(txData);
-            const jsonResult = transaction.Json;
+            const jsonResult = transaction.JsonForSigning;
 
             // eslint-disable-next-line @typescript-eslint/no-unused-vars
             const { RegularKey, Amount, ...expectedResult } = txData;

diff --git a/src/common/libs/payload/__tests__/object.test.ts b/src/common/libs/payload/__tests__/object.test.ts
@@ -26,7 +26,7 @@ describe('Payload', () => {
             'https://xumm-cdn.imgix.net/app-logo/91348bab-73d2-489a-bb7b-a8dba83e40ff.png',
         );
         expect(craftedPayload.getApplicationName()).toBe('Xaman');
-        expect(craftedPayload.getTransaction().Json).toEqual(transaction);
+        expect(craftedPayload.getTransaction().JsonForSigning).toEqual(transaction);
         expect(craftedPayload.getSigners()).toEqual(['rPEPPER7kfTD9w2To4CQk6UCfuHM9c6GDY']);
 
         const payloadPatchSpy = jest.spyOn(ApiService.payload, 'patch');
@@ -120,7 +120,7 @@ describe('Payload', () => {
         expect(fetchedPayload.getApplicationName()).toBe(AccountSetPayload.application.name);
         expect(fetchedPayload.getReturnURL()).toBe(AccountSetPayload.meta.return_url_app);
         expect(fetchedPayload.getPayloadUUID()).toBe(AccountSetPayload.meta.uuid);
-        expect(fetchedPayload.getTransaction().Json).toEqual(AccountSetPayload.payload.request_json);
+        expect(fetchedPayload.getTransaction().JsonForSigning).toEqual(AccountSetPayload.payload.request_json);
         expect(fetchedPayload.getOrigin()).toEqual(PayloadOrigin.UNKNOWN);
     });
 
@@ -132,7 +132,7 @@ describe('Payload', () => {
         expect(fetchedPayload.isPseudoTransaction()).toBe(true);
         expect(fetchedPayload.shouldSubmit()).toBe(false);
         expect(fetchedPayload.getTransactionType()).toBe('SignIn');
-        expect(fetchedPayload.getTransaction().Json).toEqual({});
+        expect(fetchedPayload.getTransaction().JsonForSigning).toEqual({});
         expect(fetchedPayload.getTransaction().Type).toEqual(PseudoTransactionTypes.SignIn);
         expect(fetchedPayload.getOrigin()).toEqual(PayloadOrigin.DEEP_LINK);
     });

diff --git a/src/common/libs/payload/object.ts b/src/common/libs/payload/object.ts
@@ -292,7 +292,7 @@ export class Payload {
      * Return true if payload generated by Xaman
      */
     isGenerated = (): boolean => {
-        return this.generated;
+        return !!this.generated;
     };
 
     /**