Skip to content

Commit 9cb5f26

Browse files
committed
fix: code clean up
1 parent 21f6801 commit 9cb5f26

File tree

4 files changed

+20
-17
lines changed

4 files changed

+20
-17
lines changed

src/common/consensus-provider/consensus-client.service.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ import { ConsensusProviderService } from './index';
22
import { Injectable } from '@nestjs/common';
33
import { processJsonStreamBeaconState } from './utils/process-json-stream-beacon-state';
44
import { BeaconState } from './consensus-provider.types';
5+
import { API_GET_STATE_URL } from './consensus-provider.constants';
56

67
@Injectable()
78
export class ConsensusClientService {
8-
private API_GET_STATE = (stateId: string) => `/eth/v2/debug/beacon/states/${stateId}`;
99
constructor(protected readonly consensusService: ConsensusProviderService) {}
1010

1111
public async isElectraActivated(epoch: number) {
@@ -14,7 +14,7 @@ export class ConsensusClientService {
1414
}
1515

1616
public async getStateStream(stateId: string): Promise<BeaconState> {
17-
const stream = await this.consensusService.fetchStream(this.API_GET_STATE(stateId));
17+
const stream = await this.consensusService.fetchStream(API_GET_STATE_URL(stateId));
1818
const result = await processJsonStreamBeaconState(stream);
1919
return result as BeaconState;
2020
}

src/common/consensus-provider/consensus-provider.constants.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,5 @@ export const CONSENSUS_RETRY_DELAY = 1_000;
44
export const CONSENSUS_RETRY_ATTEMPTS = 3;
55

66
export const CONSENSUS_REQUEST_TIMEOUT = 1800_000;
7+
8+
export const API_GET_STATE_URL = (stateId: string) => `/eth/v2/debug/beacon/states/${stateId}`;

src/common/sweep/sweep.service.ts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1+
import { ethers } from 'ethers';
12
import { Inject, Injectable, LoggerService } from '@nestjs/common';
23
import { LOGGER_PROVIDER } from '@lido-nestjs/logger';
3-
import { SLOTS_PER_EPOCH } from '../genesis-time';
4+
import { SimpleFallbackJsonRpcBatchProvider } from '@lido-nestjs/execution';
5+
import { ConfigService } from 'common/config';
46
import {
57
isFullyWithdrawableValidator,
68
isPartiallyWithdrawableValidator,
7-
} from '../../jobs/validators/utils/validator-state-utils';
8-
import { FAR_FUTURE_EPOCH } from '../../jobs/validators';
9-
import { ConsensusClientService } from '../consensus-provider/consensus-client.service';
10-
import { parseGwei } from '../utils/parse-gwei';
11-
import { bigNumberMin } from '../utils/big-number-min';
12-
import { Withdrawal } from './sweep.types';
13-
import { BeaconState, IndexedValidator, Validator } from '../consensus-provider/consensus-provider.types';
14-
import { ethers } from 'ethers';
15-
import { OracleV2__factory } from '../contracts/generated';
16-
import { VALIDATORS_EXIT_BUS_ORACLE_CONTRACT_ADDRESSES } from '../contracts/modules/validators-exit-bus-oracle/validators-exit-bus-oracle.constants';
17-
import { ConfigService } from '../config';
18-
import { SimpleFallbackJsonRpcBatchProvider } from '@lido-nestjs/execution';
9+
} from 'jobs/validators/utils/validator-state-utils';
10+
import { ConsensusClientService } from 'common/consensus-provider/consensus-client.service';
11+
import { BeaconState, IndexedValidator, Validator } from 'common/consensus-provider/consensus-provider.types';
12+
import { parseGwei } from 'common/utils/parse-gwei';
13+
import { bigNumberMin } from 'common/utils/big-number-min';
14+
import { OracleV2__factory } from 'common/contracts/generated';
15+
import { FAR_FUTURE_EPOCH } from 'jobs/validators';
16+
import { SLOTS_PER_EPOCH } from 'common/genesis-time';
17+
import { VALIDATORS_EXIT_BUS_ORACLE_CONTRACT_ADDRESSES } from 'common/contracts/modules/validators-exit-bus-oracle/validators-exit-bus-oracle.constants';
1918
import {
2019
MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP,
2120
MAX_WITHDRAWALS_PER_PAYLOAD,
2221
MIN_ACTIVATION_BALANCE,
23-
} from '../../waiting-time/waiting-time.constants';
22+
} from 'waiting-time/waiting-time.constants';
23+
import { Withdrawal } from './sweep.types';
2424

2525
@Injectable()
2626
export class SweepService {

src/storage/validators/validators-cache.service.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export class ValidatorsCacheService {
1111
static CACHE_FILE_NAME = 'validators-state.txt';
1212
static CACHE_DIR = 'cache';
1313
static CACHE_DATA_DIVIDER = '|';
14+
static CACHE_DATA_LENGTH = 5;
1415
static SERVICE_LOG_NAME = 'validators cache';
1516
static CACHE_INVALIDATE_TIME = 3 * 3600; // 3 hours
1617

@@ -30,7 +31,7 @@ export class ValidatorsCacheService {
3031
await file.close();
3132
const data: string[] = fileReadResult.split(ValidatorsCacheService.CACHE_DATA_DIVIDER);
3233

33-
if (data.length !== 5) {
34+
if (data.length !== ValidatorsCacheService.CACHE_DATA_LENGTH) {
3435
this.logger.log(`invalid cache data length`, {
3536
service: ValidatorsCacheService.SERVICE_LOG_NAME,
3637
data,

0 commit comments

Comments
 (0)