From c55006cd4b4caf858d5fd1ee880b0a212717938a Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Fri, 17 Jun 2022 16:24:50 +0800 Subject: [PATCH 1/7] fix: Fix testcase run failed locally --- .../tests/setupAndTeardown/transactions.fixture.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts b/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts index 54140236a6..f347e89a92 100644 --- a/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts +++ b/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts @@ -177,8 +177,8 @@ const ACPTx0 = { // address: ckt1qyq9t2w0l0u7rnylrxmj2uq6a28sstnctcwfu4vnst4n3u0p2luawfsmjrmsz lock: { args: '0xe2193df51d78411601796b35b17b4f8f2cd85bd0', - codeHash: systemScripts.ANYONE_CAN_PAY_MAINNET.codeHash, - hashType: systemScripts.ANYONE_CAN_PAY_MAINNET.hashType + codeHash: systemScripts.ANYONE_CAN_PAY_TESTNET.codeHash, + hashType: systemScripts.ANYONE_CAN_PAY_TESTNET.hashType }, type: { args: '0xe2193df51d78411601796b35b17b4f8f2cd85bd0', @@ -224,8 +224,8 @@ const ACPTx1 = { // address: ckt1qyq9t2w0l0u7rnylrxmj2uq6a28sstnctcwfu4vnst4n3u0p2luawfsmjrmsz lock: { args: '0xe2193df51d78411601796b35b17b4f8f2cd85bd0', - codeHash: systemScripts.ANYONE_CAN_PAY_MAINNET.codeHash, - hashType: systemScripts.ANYONE_CAN_PAY_MAINNET.hashType + codeHash: systemScripts.ANYONE_CAN_PAY_TESTNET.codeHash, + hashType: systemScripts.ANYONE_CAN_PAY_TESTNET.hashType }, capacity: '0x34e62ce00', outPoint: { txHash: '0x230ab250ee0ae681e88e462102e5c01a9994ac82bf0effbfb58d6c11a8657900', index: '0' } From d9e78c1f3abc3400bf0514179693633cd23c0997 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Fri, 17 Jun 2022 18:00:32 +0800 Subject: [PATCH 2/7] fix: Wait restart excute finish --- packages/neuron-wallet/tests/services/monitor.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/neuron-wallet/tests/services/monitor.test.ts b/packages/neuron-wallet/tests/services/monitor.test.ts index 3aa7f8c488..af8ab977ca 100644 --- a/packages/neuron-wallet/tests/services/monitor.test.ts +++ b/packages/neuron-wallet/tests/services/monitor.test.ts @@ -111,10 +111,10 @@ describe('base monitor', () => { monitor.clearMonitor() }) it('not living wait restart', async () => { - isLivingMock.mockResolvedValueOnce(false) + isLivingMock.mockResolvedValue(true).mockResolvedValueOnce(false) restartMock.mockImplementation(() => wait(400)) monitor.startMonitor(100) - await wait(400) + await wait(800) expect(isLivingMock).toHaveBeenCalled() expect(restartMock).toHaveBeenCalledTimes(1) monitor.clearMonitor() From f335ce2c5a54c9b521f6b5a522347f2b07930936 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Sun, 19 Jun 2022 13:50:09 +0800 Subject: [PATCH 3/7] fix: Mock network with testnet --- .../services/tx/transaction-generator.test.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts index 6b566f98b8..f50169d3cc 100644 --- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts +++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts @@ -72,6 +72,24 @@ jest.doMock('../../../src/services/wallets', () => ({ } } })) +jest.doMock('../../../src/services/networks', () => { + const originalModule = jest.requireActual('../../../src/services/networks').default + return { + getInstance() { + const res = new originalModule() + const current = res.getCurrent() + return { + ...res, + getCurrent() { + return { + ...current, + genesisHash: '0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e6' + } + } + } + } + } +}) import TransactionGenerator from '../../../src/services/tx/transaction-generator' import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-info' From 5a470dceffb462963bd67f5f6603b68339edd471 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Sun, 19 Jun 2022 14:03:38 +0800 Subject: [PATCH 4/7] fix: Set network default as testnet --- .../services/tx/transaction-service.test.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts index f6118da58f..8241c291fe 100644 --- a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts +++ b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts @@ -10,6 +10,25 @@ import transactions from '../../setupAndTeardown/transactions.fixture' import { getConnection } from 'typeorm' import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-info' +jest.doMock('../../../src/services/networks', () => { + const originalModule = jest.requireActual('../../../src/services/networks').default + return { + getInstance() { + const res = new originalModule() + const current = res.getCurrent() + return { + ...res, + getCurrent() { + return { + ...current, + genesisHash: '0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e6' + } + } + } + } + } +}) + describe('Test TransactionService', () => { beforeAll(async () => { await initConnection() From efdce590f34c8bd3279bf2b7eb92e7e066d28f31 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Sun, 19 Jun 2022 14:41:14 +0800 Subject: [PATCH 5/7] fix: Mock testnet AssetAccountInfo --- .../services/tx/transaction-service.test.ts | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts index 8241c291fe..c0b9945ab0 100644 --- a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts +++ b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts @@ -10,22 +10,10 @@ import transactions from '../../setupAndTeardown/transactions.fixture' import { getConnection } from 'typeorm' import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-info' -jest.doMock('../../../src/services/networks', () => { - const originalModule = jest.requireActual('../../../src/services/networks').default - return { - getInstance() { - const res = new originalModule() - const current = res.getCurrent() - return { - ...res, - getCurrent() { - return { - ...current, - genesisHash: '0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e6' - } - } - } - } +jest.doMock('../../../src/models/asset-account-info', () => { + const originalModule = jest.requireActual('../../../src/models/asset-account-info').default + return function() { + return new originalModule('0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e5') } }) From 96e0925ff6530ec30800d8fa987a77097ae48477 Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Sun, 19 Jun 2022 17:37:27 +0800 Subject: [PATCH 6/7] fix: Set AssetAccountInfo mainnet --- .../tests/services/tx/transaction-service.test.ts | 2 +- .../tests/setupAndTeardown/transactions.fixture.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts index c0b9945ab0..6ed5734137 100644 --- a/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts +++ b/packages/neuron-wallet/tests/services/tx/transaction-service.test.ts @@ -10,7 +10,7 @@ import transactions from '../../setupAndTeardown/transactions.fixture' import { getConnection } from 'typeorm' import HdPublicKeyInfo from '../../../src/database/chain/entities/hd-public-key-info' -jest.doMock('../../../src/models/asset-account-info', () => { +jest.mock('../../../src/models/asset-account-info', () => { const originalModule = jest.requireActual('../../../src/models/asset-account-info').default return function() { return new originalModule('0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e5') diff --git a/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts b/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts index f347e89a92..54140236a6 100644 --- a/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts +++ b/packages/neuron-wallet/tests/setupAndTeardown/transactions.fixture.ts @@ -177,8 +177,8 @@ const ACPTx0 = { // address: ckt1qyq9t2w0l0u7rnylrxmj2uq6a28sstnctcwfu4vnst4n3u0p2luawfsmjrmsz lock: { args: '0xe2193df51d78411601796b35b17b4f8f2cd85bd0', - codeHash: systemScripts.ANYONE_CAN_PAY_TESTNET.codeHash, - hashType: systemScripts.ANYONE_CAN_PAY_TESTNET.hashType + codeHash: systemScripts.ANYONE_CAN_PAY_MAINNET.codeHash, + hashType: systemScripts.ANYONE_CAN_PAY_MAINNET.hashType }, type: { args: '0xe2193df51d78411601796b35b17b4f8f2cd85bd0', @@ -224,8 +224,8 @@ const ACPTx1 = { // address: ckt1qyq9t2w0l0u7rnylrxmj2uq6a28sstnctcwfu4vnst4n3u0p2luawfsmjrmsz lock: { args: '0xe2193df51d78411601796b35b17b4f8f2cd85bd0', - codeHash: systemScripts.ANYONE_CAN_PAY_TESTNET.codeHash, - hashType: systemScripts.ANYONE_CAN_PAY_TESTNET.hashType + codeHash: systemScripts.ANYONE_CAN_PAY_MAINNET.codeHash, + hashType: systemScripts.ANYONE_CAN_PAY_MAINNET.hashType }, capacity: '0x34e62ce00', outPoint: { txHash: '0x230ab250ee0ae681e88e462102e5c01a9994ac82bf0effbfb58d6c11a8657900', index: '0' } From 42181320d89cc61425838bbe4c4d8b60201b8dbf Mon Sep 17 00:00:00 2001 From: yanguoyu <841185308@qq.com> Date: Mon, 20 Jun 2022 11:00:14 +0800 Subject: [PATCH 7/7] fix: Mock assetAccountInfo --- .../services/tx/transaction-generator.test.ts | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts index f50169d3cc..0527ce5def 100644 --- a/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts +++ b/packages/neuron-wallet/tests/services/tx/transaction-generator.test.ts @@ -72,22 +72,10 @@ jest.doMock('../../../src/services/wallets', () => ({ } } })) -jest.doMock('../../../src/services/networks', () => { - const originalModule = jest.requireActual('../../../src/services/networks').default - return { - getInstance() { - const res = new originalModule() - const current = res.getCurrent() - return { - ...res, - getCurrent() { - return { - ...current, - genesisHash: '0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e6' - } - } - } - } +jest.mock('../../../src/models/asset-account-info', () => { + const originalModule = jest.requireActual('../../../src/models/asset-account-info').default + return function() { + return new originalModule('0x92b197aa1fba0f63633922c61c92375c9c074a93e85963554f5499fe1450d0e6') } })