consolidate wallet sync status into shared WalletSyncStatus type.

This commit is contained in:
2026-09-06 15:21:13 +02:00
parent 9e776df79f
commit 5f1c8bee4b
8 changed files with 22 additions and 27 deletions
@@ -1,6 +1,6 @@
import { ServiceUnavailableException } from '@nestjs/common';
import type { ConfigService } from '@nestjs/config';
import { BitcoinWalletSyncStatus } from '../types/BitcoinWalletSyncStatus';
import { WalletSyncStatus } from '../../../types/wallet/WalletSyncStatus';
import type { ElectrumWalletRpcClient } from './ElectrumWalletRpcClient';
import { BitcoinWalletAdminService } from './BitcoinWalletAdminService';
@@ -51,7 +51,7 @@ describe('BitcoinWalletAdminService', () => {
rpcVersion: '4.8.1',
blockHeight: 900_000,
serverHeight: 900_000,
syncStatus: BitcoinWalletSyncStatus.Synced,
syncStatus: WalletSyncStatus.Synced,
balanceBtc: '0.00150000',
confirmedBalanceBtc: '0.00150000'
})
@@ -63,7 +63,7 @@ describe('BitcoinWalletAdminService', () => {
const status = await service.getStatus();
expect(status.syncStatus).toBe(BitcoinWalletSyncStatus.Syncing);
expect(status.syncStatus).toBe(WalletSyncStatus.Syncing);
});
it('throws when RPC calls fail', async () => {
@@ -2,7 +2,7 @@ import { Injectable, ServiceUnavailableException } from '@nestjs/common';
import { ConfigService } from '@nestjs/config';
import { convertBtcAtomicToBtc } from '../../../utils/bitcoin/convertBtcAtomicToBtc';
import type { Config } from '../../../types/Config';
import { BitcoinWalletSyncStatus } from '../types/BitcoinWalletSyncStatus';
import { WalletSyncStatus } from '../../../types/wallet/WalletSyncStatus';
import type { BitcoinWalletStatusView } from '../types/BitcoinWalletStatusView';
import { ElectrumWalletRpcClient } from './ElectrumWalletRpcClient';
@@ -47,15 +47,15 @@ export class BitcoinWalletAdminService {
isSynchronized: boolean,
blockHeight: number | null,
serverHeight: number | null
): BitcoinWalletSyncStatus {
): WalletSyncStatus {
if (isSynchronized) {
return BitcoinWalletSyncStatus.Synced;
return WalletSyncStatus.Synced;
}
if (blockHeight === null || serverHeight === null) {
return BitcoinWalletSyncStatus.Unknown;
return WalletSyncStatus.Unknown;
}
return BitcoinWalletSyncStatus.Syncing;
return WalletSyncStatus.Syncing;
}
}