fix: e2e connects tests

lidofinance · Dec 21, 2023 · 05d2553 · 05d2553
1 parent 91ef826
commit 05d2553
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 13 deletions.
diff --git a/src/common/registry/fetch/operator.fetch.ts b/src/common/registry/fetch/operator.fetch.ts
@@ -59,12 +59,27 @@ export class RegistryOperatorFetchService {
     return false;
   }
 
+  /** return blockTag for finalized block, it need for testing purposes */
+  public getFinalizedBlockTag() {
+    return 'finalized';
+  }
+
   /** fetches number of operators */
   public async count(moduleAddress: string, overrides: CallOverrides = {}): Promise<number> {
     const bigNumber = await this.getContract(moduleAddress).getNodeOperatorsCount(overrides as any);
     return bigNumber.toNumber();
   }
 
+  /** fetches finalized operator */
+  public async getFinalizedNodeOperator(moduleAddress: string, operatorIndex: number) {
+    const fullInfo = true;
+    const contract = this.getContract(moduleAddress);
+    const finalizedOperator = await contract.getNodeOperator(operatorIndex, fullInfo, {
+      blockTag: this.getFinalizedBlockTag(),
+    });
+    return finalizedOperator;
+  }
+
   /** fetches one operator */
   public async fetchOne(
     moduleAddress: string,
@@ -75,9 +90,6 @@ export class RegistryOperatorFetchService {
     const contract = this.getContract(moduleAddress);
 
     const operator = await contract.getNodeOperator(operatorIndex, fullInfo, overrides as any);
-    const finalizedOperator = await contract.getNodeOperator(operatorIndex, fullInfo, {
-      blockTag: 'finalized',
-    });
 
     const {
       name,
@@ -89,7 +101,10 @@ export class RegistryOperatorFetchService {
       totalDepositedValidators,
     } = operator;
 
-    const { totalDepositedValidators: finalizedUsedSigningKeys } = finalizedOperator;
+    const { totalDepositedValidators: finalizedUsedSigningKeys } = await this.getFinalizedNodeOperator(
+      moduleAddress,
+      operatorIndex,
+    );
 
     return {
       index: operatorIndex,

diff --git a/src/common/registry/test/key-registry/connect.e2e-spec.ts b/src/common/registry/test/key-registry/connect.e2e-spec.ts
@@ -2,7 +2,7 @@ import { Test } from '@nestjs/testing';
 import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { nullTransport, LoggerModule } from '@lido-nestjs/logger';
 import { BatchProviderModule, ExtendedJsonRpcBatchProvider } from '@lido-nestjs/execution';
-import { KeyRegistryModule, KeyRegistryService, RegistryStorageService } from '../../';
+import { KeyRegistryModule, KeyRegistryService, RegistryOperatorFetchService, RegistryStorageService } from '../../';
 import { clearDb, compareTestOperators, mikroORMConfig } from '../testing.utils';
 import { operators } from '../fixtures/connect.fixture';
 import { MikroORM } from '@mikro-orm/core';
@@ -14,6 +14,7 @@ dotenv.config();
 describe('Registry', () => {
   let registryService: KeyRegistryService;
   let storageService: RegistryStorageService;
+  let registryOperatorFetchService: RegistryOperatorFetchService;
   let mikroOrm: MikroORM;
   if (!process.env.CHAIN_ID) {
     console.error("CHAIN_ID wasn't provides");
@@ -24,6 +25,8 @@ describe('Registry', () => {
     return { ...key, moduleAddress: address };
   });
 
+  const blockHash = '0x4ef0f15a8a04a97f60a9f76ba83d27bcf98dac9635685cd05fe1d78bd6e93418';
+
   beforeEach(async () => {
     const imports = [
       MikroOrmModule.forRoot(mikroORMConfig),
@@ -46,7 +49,11 @@ describe('Registry', () => {
     const moduleRef = await Test.createTestingModule({ imports }).compile();
     registryService = moduleRef.get(KeyRegistryService);
     storageService = moduleRef.get(RegistryStorageService);
+    registryOperatorFetchService = moduleRef.get(RegistryOperatorFetchService);
     mikroOrm = moduleRef.get(MikroORM);
+
+    jest.spyOn(registryOperatorFetchService, 'getFinalizedBlockTag').mockImplementation(() => ({ blockHash } as any));
+
     const generator = mikroOrm.getSchemaGenerator();
     await generator.updateSchema();
   });
@@ -56,9 +63,7 @@ describe('Registry', () => {
     await storageService.onModuleDestroy();
   });
 
-  test.skip('Update', async () => {
-    const blockHash = '0x4ef0f15a8a04a97f60a9f76ba83d27bcf98dac9635685cd05fe1d78bd6e93418';
-
+  test('Update', async () => {
     await registryService.update(address, blockHash);
 
     await compareTestOperators(address, registryService, {

diff --git a/src/common/registry/test/validator-registry/connect.e2e-spec.ts b/src/common/registry/test/validator-registry/connect.e2e-spec.ts
@@ -3,7 +3,12 @@ import { MikroOrmModule } from '@mikro-orm/nestjs';
 import { nullTransport, LoggerModule } from '@lido-nestjs/logger';
 import { BatchProviderModule, ExtendedJsonRpcBatchProvider } from '@lido-nestjs/execution';
 
-import { ValidatorRegistryModule, ValidatorRegistryService, RegistryStorageService } from '../../';
+import {
+  ValidatorRegistryModule,
+  ValidatorRegistryService,
+  RegistryStorageService,
+  RegistryOperatorFetchService,
+} from '../../';
 
 import { clearDb, compareTestOperators, mikroORMConfig } from '../testing.utils';
 import { operators } from '../fixtures/connect.fixture';
@@ -15,6 +20,7 @@ dotenv.config();
 
 describe('Registry', () => {
   let registryService: ValidatorRegistryService;
+  let registryOperatorFetchService: RegistryOperatorFetchService;
   let mikroOrm: MikroORM;
 
   let storageService: RegistryStorageService;
@@ -28,6 +34,8 @@ describe('Registry', () => {
     return { ...key, moduleAddress: address };
   });
 
+  const blockHash = '0x4ef0f15a8a04a97f60a9f76ba83d27bcf98dac9635685cd05fe1d78bd6e93418';
+
   beforeEach(async () => {
     const imports = [
       MikroOrmModule.forRoot(mikroORMConfig),
@@ -50,8 +58,11 @@ describe('Registry', () => {
     const moduleRef = await Test.createTestingModule({ imports }).compile();
     registryService = moduleRef.get(ValidatorRegistryService);
     storageService = moduleRef.get(RegistryStorageService);
-
+    registryOperatorFetchService = moduleRef.get(RegistryOperatorFetchService);
     mikroOrm = moduleRef.get(MikroORM);
+
+    jest.spyOn(registryOperatorFetchService, 'getFinalizedBlockTag').mockImplementation(() => ({ blockHash } as any));
+
     const generator = mikroOrm.getSchemaGenerator();
     await generator.updateSchema();
   });
@@ -62,9 +73,7 @@ describe('Registry', () => {
     await storageService.onModuleDestroy();
   });
 
-  test.skip('Update', async () => {
-    const blockHash = '0x4ef0f15a8a04a97f60a9f76ba83d27bcf98dac9635685cd05fe1d78bd6e93418';
-
+  test('Update', async () => {
     await registryService.update(address, blockHash);
 
     await compareTestOperators(address, registryService, {