From 1894fae9aef1ba6e2bb8587010ba1118458f4daf Mon Sep 17 00:00:00 2001 From: Rebegea Dragos-Alexandru Date: Mon, 17 Jul 2023 13:47:12 +0300 Subject: [PATCH] MEX-322: renaming --- ...=> governance.energy.contract.resolver.ts} | 26 +++++++++---------- src/modules/governance/governance.module.ts | 4 +-- .../models/energy.contract.model.ts | 4 +-- .../governance/models/governance.union.ts | 8 +++--- .../governance/services/governance.service.ts | 6 ++--- 5 files changed, 24 insertions(+), 24 deletions(-) rename src/modules/governance/{governance.contract.resolver.ts => governance.energy.contract.resolver.ts} (56%) diff --git a/src/modules/governance/governance.contract.resolver.ts b/src/modules/governance/governance.energy.contract.resolver.ts similarity index 56% rename from src/modules/governance/governance.contract.resolver.ts rename to src/modules/governance/governance.energy.contract.resolver.ts index 25da3f914..292c4c896 100644 --- a/src/modules/governance/governance.contract.resolver.ts +++ b/src/modules/governance/governance.energy.contract.resolver.ts @@ -1,62 +1,62 @@ import { Parent, ResolveField, Resolver } from '@nestjs/graphql'; import { GovernanceAbiService } from './services/governance.abi.service'; -import { EnergyContract } from './models/energy.contract.model'; +import { GovernanceEnergyContract } from './models/energy.contract.model'; import { GovernanceProposal } from './models/governance.proposal.model'; -@Resolver(() => EnergyContract) -export class EnergyContractResolver { +@Resolver(() => GovernanceEnergyContract) +export class GovernanceEnergyContractResolver { constructor( private readonly governanceAbi: GovernanceAbiService, ) { } @ResolveField() - async minEnergyForPropose(@Parent() energyContract: EnergyContract): Promise { + async minEnergyForPropose(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.minEnergyForPropose(energyContract.address); } @ResolveField() - async minFeeForPropose(@Parent() energyContract: EnergyContract): Promise { + async minFeeForPropose(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.minFeeForPropose(energyContract.address); } @ResolveField() - async quorum(@Parent() energyContract: EnergyContract): Promise { + async quorum(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.quorum(energyContract.address); } @ResolveField() - async votingDelayInBlocks(@Parent() energyContract: EnergyContract): Promise { + async votingDelayInBlocks(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.votingDelayInBlocks(energyContract.address); } @ResolveField() - async votingPeriodInBlocks(@Parent() energyContract: EnergyContract): Promise { + async votingPeriodInBlocks(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.votingPeriodInBlocks(energyContract.address); } @ResolveField() - async feeTokenId(@Parent() energyContract: EnergyContract): Promise { + async feeTokenId(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.feeTokenId(energyContract.address); } @ResolveField() - async withdrawPercentageDefeated(@Parent() energyContract: EnergyContract): Promise { + async withdrawPercentageDefeated(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.withdrawPercentageDefeated(energyContract.address); } @ResolveField(() => [GovernanceProposal]) - async proposals(@Parent() energyContract: EnergyContract): Promise { + async proposals(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.proposals(energyContract.address); } @ResolveField() - async feesCollectorAddress(@Parent() energyContract: EnergyContract): Promise { + async feesCollectorAddress(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.feesCollectorAddress(energyContract.address); } @ResolveField() - async energyFactoryAddress(@Parent() energyContract: EnergyContract): Promise { + async energyFactoryAddress(@Parent() energyContract: GovernanceEnergyContract): Promise { return this.governanceAbi.energyFactoryAddress(energyContract.address); } } diff --git a/src/modules/governance/governance.module.ts b/src/modules/governance/governance.module.ts index 89ea04fe0..e73c1fff7 100644 --- a/src/modules/governance/governance.module.ts +++ b/src/modules/governance/governance.module.ts @@ -7,7 +7,7 @@ import { TokenModule } from '../tokens/token.module'; import { EnergyModule } from '../energy/energy.module'; import { GovernanceAbiService } from './services/governance.abi.service'; import { GovernanceQueryResolver } from './governance.query.resolver'; -import { EnergyContractResolver } from './governance.contract.resolver'; +import { GovernanceEnergyContractResolver } from './governance.energy.contract.resolver'; import { GovernanceProposalResolver } from './governance.propose.resolver'; import { GovernanceService } from './services/governance.service'; @@ -28,7 +28,7 @@ import { GovernanceService } from './services/governance.service'; // GovernanceComputeService, // GovernanceTransactionService, GovernanceQueryResolver, - EnergyContractResolver, + GovernanceEnergyContractResolver, GovernanceProposalResolver, ], exports: [ diff --git a/src/modules/governance/models/energy.contract.model.ts b/src/modules/governance/models/energy.contract.model.ts index 13d424627..b116fdc8d 100644 --- a/src/modules/governance/models/energy.contract.model.ts +++ b/src/modules/governance/models/energy.contract.model.ts @@ -9,7 +9,7 @@ export enum GovernanceType { registerEnumType(GovernanceType, { name: 'GovernanceType' }); @ObjectType() -export class EnergyContract { +export class GovernanceEnergyContract { @Field() address: string; @Field() @@ -33,7 +33,7 @@ export class EnergyContract { @Field() energyFactoryAddress: string; - constructor(init: Partial) { + constructor(init: Partial) { Object.assign(this, init); } } diff --git a/src/modules/governance/models/governance.union.ts b/src/modules/governance/models/governance.union.ts index 9fefbbf73..6c0e284a0 100644 --- a/src/modules/governance/models/governance.union.ts +++ b/src/modules/governance/models/governance.union.ts @@ -1,16 +1,16 @@ import { createUnionType } from '@nestjs/graphql'; -import { EnergyContract } from './energy.contract.model'; +import { GovernanceEnergyContract } from './energy.contract.model'; export const GovernanceUnion = createUnionType({ name: 'GovernanceTypes', types: () => [ - EnergyContract, + GovernanceEnergyContract, ] as const, resolveType(governance) { switch (governance.constructor.name) { - case EnergyContract.name: - return EnergyContract; + case GovernanceEnergyContract.name: + return GovernanceEnergyContract; } }, }); diff --git a/src/modules/governance/services/governance.service.ts b/src/modules/governance/services/governance.service.ts index 7c6bc9f80..6c92d969e 100644 --- a/src/modules/governance/services/governance.service.ts +++ b/src/modules/governance/services/governance.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { EnergyContract, GovernanceType } from '../models/energy.contract.model'; +import { GovernanceEnergyContract, GovernanceType } from '../models/energy.contract.model'; import { governanceContractsAddresses, governanceType } from '../../../utils/governance'; import { GovernanceContractsFiltersArgs } from '../models/contracts.filter.args'; import { GovernanceAbiService } from './governance.abi.service'; @@ -18,7 +18,7 @@ export class GovernanceService { governanceAddresses.filter((address) => !filters.contracts.includes(address)); } - const governance: EnergyContract[] = []; + const governance: GovernanceEnergyContract[] = []; for (const address of governanceAddresses) { const type = governanceType(address); if (filters.type && filters.type !== type) { @@ -27,7 +27,7 @@ export class GovernanceService { switch (type) { case GovernanceType.ENERGY: governance.push( - new EnergyContract({ + new GovernanceEnergyContract({ address, }), );