refactor order alphabetically

Author: vinistevam

packages/transaction-controller/src/EtherscanRemoteTransactionSource.test.ts

@@ -89,6 +89,7 @@ const ETHERSCAN_TOKEN_TRANSACTION_RESPONSE_EMPTY_MOCK: EtherscanTransactionRespo
 const EXPECTED_NORMALISED_TRANSACTION_BASE = {
   blockNumber: ETHERSCAN_TRANSACTION_SUCCESS_MOCK.blockNumber,
   chainId: undefined,
+  hash: ETHERSCAN_TRANSACTION_SUCCESS_MOCK.hash,
   id: ID_MOCK,
   networkID: undefined,
   status: TransactionStatus.confirmed,
@@ -102,7 +103,6 @@ const EXPECTED_NORMALISED_TRANSACTION_BASE = {
     to: ETHERSCAN_TRANSACTION_SUCCESS_MOCK.to,
     value: '0xb1a2bc2ec50000',
   },
-  hash: ETHERSCAN_TRANSACTION_SUCCESS_MOCK.hash,
   verifiedOnBlockchain: false,
 };
 

packages/transaction-controller/src/EtherscanRemoteTransactionSource.ts

@@ -141,6 +141,7 @@ export class EtherscanRemoteTransactionSource
     return {
       blockNumber: txMeta.blockNumber,
       chainId: currentChainId,
+      hash: txMeta.hash,
       id: random({ msecs: time }),
       networkID: currentNetworkId,
       status: TransactionStatus.confirmed,
@@ -154,7 +155,6 @@ export class EtherscanRemoteTransactionSource
         to: txMeta.to,
         value: BNToHex(new BN(txMeta.value)),
       },
-      hash: txMeta.hash,
       verifiedOnBlockchain: false,
     };
   }

packages/transaction-controller/src/IncomingTransactionHelper.test.ts

@@ -45,18 +45,18 @@ const CONTROLLER_ARGS_MOCK = {
 const TRANSACTION_MOCK: TransactionMeta = {
   blockNumber: '123',
   chainId: '0x1',
+  hash: '0x1',
   status: TransactionStatus.submitted,
   time: 0,
   transaction: { to: '0x1', gasUsed: '0x1' },
-  hash: '0x1',
 } as unknown as TransactionMeta;
 
 const TRANSACTION_MOCK_2: TransactionMeta = {
   blockNumber: '234',
+  hash: '0x2',
   chainId: '0x1',
   time: 1,
   transaction: { to: '0x1' },
-  hash: '0x2',
 } as unknown as TransactionMeta;
 
 const createRemoteTransactionSourceMock = (

packages/transaction-controller/src/TransactionController.test.ts

@@ -84,8 +84,8 @@ jest.mock('@metamask/eth-query', () =>
       },
       getTransactionByHash: (_hash: string, callback: any) => {
         const txs: any = [
-          { hash: '1337', blockNumber: '0x1' },
-          { hash: '1338', blockNumber: null },
+          { blockNumber: '0x1', hash: '1337' },
+          { blockNumber: null, hash: '1338' },
         ];
         const tx: any = txs.find((element: any) => element.hash === _hash);
         callback(undefined, tx);
@@ -99,15 +99,15 @@ jest.mock('@metamask/eth-query', () =>
       getTransactionReceipt: (_hash: any, callback: any) => {
         const txs: any = [
           {
-            hash: '1337',
+            blockHash: '1337',
             gasUsed: '0x5208',
+            hash: '1337',
             status: '0x1',
             transactionIndex: 1337,
-            blockHash: '1337',
           },
           {
-            hash: '1111',
             gasUsed: '0x1108',
+            hash: '1111',
             status: '0x0',
             transactionIndex: 1111,
           },
@@ -118,9 +118,9 @@ jest.mock('@metamask/eth-query', () =>
       getBlockByHash: (_blockHash: any, callback: any) => {
         const blocks: any = [
           {
+            baseFeePerGas: '0x14',
             hash: '1337',
             number: '0x1',
-            baseFeePerGas: '0x14',
             timestamp: '628dc0c8',
           },
           { hash: '1338', number: '0x2' },
@@ -395,21 +395,21 @@ const NONCE_MOCK = 12;
 const ACTION_ID_MOCK = '123456';
 
 const TRANSACTION_META_MOCK = {
+  hash: '0x1',
   status: TransactionStatus.confirmed,
+  time: 123456789,
   transaction: {
     from: ACCOUNT_MOCK,
   },
-  hash: '0x1',
-  time: 123456789,
 } as TransactionMeta;
 
 const TRANSACTION_META_2_MOCK = {
+  hash: '0x2',
   status: TransactionStatus.confirmed,
+  time: 987654321,
   transaction: {
     from: '0x3',
   },
-  hash: '0x2',
-  time: 987654321,
 } as TransactionMeta;
 
 describe('TransactionController', () => {
@@ -1378,10 +1378,10 @@ describe('TransactionController', () => {
 
       controller.state.transactions.push({
         from: MOCK_PREFERENCES.state.selectedAddress,
+        hash: '1337',
         id: 'foo',
         networkID: '5',
         status: TransactionStatus.submitted,
-        hash: '1337',
       } as any);
 
       controller.wipeTransactions();
@@ -1457,12 +1457,12 @@ describe('TransactionController', () => {
       const controller = newController();
 
       controller.state.transactions.push({
+        chainId: toHex(5),
         from: MOCK_PREFERENCES.state.selectedAddress,
+        hash: '1337',
         id: 'foo',
         networkID: '5',
-        chainId: toHex(5),
         status: TransactionStatus.submitted,
-        hash: '1337',
       } as any);
 
       controller.state.transactions.push({} as any);
@@ -1484,10 +1484,10 @@ describe('TransactionController', () => {
 
       controller.state.transactions.push({
         from: MOCK_PREFERENCES.state.selectedAddress,
+        hash: '1337',
         id: 'foo',
         networkID: '5',
         status: TransactionStatus.submitted,
-        hash: '1337',
       } as any);
 
       controller.state.transactions.push({} as any);
@@ -1523,16 +1523,16 @@ describe('TransactionController', () => {
       const controller = newController();
 
       controller.state.transactions.push({
+        chainId: toHex(5),
         from: MOCK_PREFERENCES.state.selectedAddress,
+        hash: '1337',
         id: 'foo',
         networkID: '5',
-        chainId: toHex(5),
         status: TransactionStatus.confirmed,
-        hash: '1337',
-        verifiedOnBlockchain: false,
         transaction: {
           gasUsed: undefined,
         },
+        verifiedOnBlockchain: false,
       } as any);
 
       await controller.queryTransactionStatuses();
@@ -1779,10 +1779,10 @@ describe('TransactionController', () => {
     it('creates approvals for all unapproved transaction', async () => {
       const transaction = {
         from: ACCOUNT_MOCK,
+        hash: '1337',
         id: 'mocked',
         networkID: '5',
         status: TransactionStatus.unapproved,
-        hash: '1337',
       };
       const controller = newController();
       controller.state.transactions.push(transaction as any);