Refactor getAccountInfo to fetchAccountInfo

vacuumlabs · Oct 18, 2021 · bf8b341 · bf8b341
1 parent 51767e3
commit bf8b341
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/app/frontend/actions/accounts.ts b/app/frontend/actions/accounts.ts
@@ -29,7 +29,7 @@ export default (store: Store) => {
     try {
       loadingAction(state, 'Loading account')
       const nextAccount = await getWallet().exploreNextAccount()
-      const accountInfo = await nextAccount.getAccountInfo(state.validStakepoolDataProvider)
+      const accountInfo = await nextAccount.fetchAccountInfo(state.validStakepoolDataProvider)
       // TODO: remove the type conversion
       const accountsInfo = [...state.accountsInfo, accountInfo] as AccountInfo[]
       // TODO: how about other states? is big delegator etc.

diff --git a/app/frontend/wallet/account.ts b/app/frontend/wallet/account.ts
@@ -319,7 +319,7 @@ const Account = ({config, cryptoProvider, blockchainExplorer, accountIndex}: Acc
     return config.isShelleyCompatible && myAddresses.areAddressesUsed()
   }
 
-  async function getAccountInfo(validStakepoolDataProvider: StakepoolDataProvider) {
+  async function fetchAccountInfo(validStakepoolDataProvider: StakepoolDataProvider) {
     const accountXpubs = await getAccountXpubs()
     const stakingXpub = await getStakingXpub(cryptoProvider, accountIndex)
     const stakingAddress = await myAddresses.getStakingAddress()
@@ -487,7 +487,7 @@ const Account = ({config, cryptoProvider, blockchainExplorer, accountIndex}: Acc
     getVisibleAddresses,
     prepareTxAux,
     verifyAddress,
-    getAccountInfo,
+    fetchAccountInfo,
     getStakingInfo,
     accountIndex,
     getPoolRecommendation,

diff --git a/app/frontend/wallet/shelley-wallet.ts b/app/frontend/wallet/shelley-wallet.ts
@@ -78,7 +78,7 @@ const ShelleyWallet = ({config, cryptoProvider}: WalletParams) => {
     const accounts = await accountManager.discoverAccounts()
     //@ts-ignore TODO: refactor type AccountInfo
     return Promise.all(
-      accounts.map((account) => account.getAccountInfo(validStakepoolDataProvider))
+      accounts.map((account) => account.fetchAccountInfo(validStakepoolDataProvider))
     )
   }
 

diff --git a/app/tests/src/actions/transaction-actions.js b/app/tests/src/actions/transaction-actions.js
@@ -17,7 +17,7 @@ before(() => {
   ADALITE_CONFIG.ADALITE_NETWORK = 'MAINNET'
   const mockNet = mockNetwork(ADALITE_CONFIG)
   mockNet.mockBulkAddressSummaryEndpoint()
-  mockNet.mockGetAccountInfo()
+  mockNet.mockFetchAccountInfo()
   mockNet.mockGetStakePools()
   mockNet.mockGetConversionRates()
   mockNet.mockUtxoEndpoint()

diff --git a/app/tests/src/actions/wallet-actions.js b/app/tests/src/actions/wallet-actions.js
@@ -45,7 +45,7 @@ it('Should properly load shelley wallet', async () => {
   ADALITE_CONFIG.ADALITE_NETWORK = 'MAINNET'
   const mockNet = mockNetwork(ADALITE_CONFIG)
   mockNet.mockBulkAddressSummaryEndpoint()
-  mockNet.mockGetAccountInfo()
+  mockNet.mockFetchAccountInfo()
   mockNet.mockGetStakePools()
   mockNet.mockGetConversionRates()
   mockNet.mockPoolMeta()

diff --git a/app/tests/src/common/mock.js b/app/tests/src/common/mock.js
@@ -44,7 +44,7 @@ const mock = (ADALITE_CONFIG) => {
     })
   }
 
-  function mockGetAccountInfo() {
+  function mockFetchAccountInfo() {
     fetchMock.config.overwriteRoutes = true
     const acctInfoMock = {
       delegation: {},
@@ -314,7 +314,7 @@ const mock = (ADALITE_CONFIG) => {
 
   return {
     mockBulkAddressSummaryEndpoint,
-    mockGetAccountInfo,
+    mockFetchAccountInfo,
     mockGetStakePools,
     mockGetConversionRates,
     mockTransactionSubmitter,

diff --git a/app/tests/src/wallet/account/account.js b/app/tests/src/wallet/account/account.js
@@ -54,7 +54,7 @@ before(async () => {
   ADALITE_CONFIG.ADALITE_NETWORK = 'MAINNET'
   const mockNet = mockNetwork(ADALITE_CONFIG)
   mockNet.mockBulkAddressSummaryEndpoint()
-  mockNet.mockGetAccountInfo()
+  mockNet.mockFetchAccountInfo()
   mockNet.mockGetStakePools()
   mockNet.mockGetConversionRates()
   mockNet.mockUtxoEndpoint()