Skip to content

Commit

Permalink
MEX-322: renaming
Browse files Browse the repository at this point in the history
  • Loading branch information
dragos-rebegea committed Jul 17, 2023
1 parent 941fb3e commit 1894fae
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -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<string> {
async minEnergyForPropose(@Parent() energyContract: GovernanceEnergyContract): Promise<string> {
return this.governanceAbi.minEnergyForPropose(energyContract.address);
}

@ResolveField()
async minFeeForPropose(@Parent() energyContract: EnergyContract): Promise<string> {
async minFeeForPropose(@Parent() energyContract: GovernanceEnergyContract): Promise<string> {
return this.governanceAbi.minFeeForPropose(energyContract.address);
}

@ResolveField()
async quorum(@Parent() energyContract: EnergyContract): Promise<string> {
async quorum(@Parent() energyContract: GovernanceEnergyContract): Promise<string> {
return this.governanceAbi.quorum(energyContract.address);
}

@ResolveField()
async votingDelayInBlocks(@Parent() energyContract: EnergyContract): Promise<number> {
async votingDelayInBlocks(@Parent() energyContract: GovernanceEnergyContract): Promise<number> {
return this.governanceAbi.votingDelayInBlocks(energyContract.address);
}

@ResolveField()
async votingPeriodInBlocks(@Parent() energyContract: EnergyContract): Promise<number> {
async votingPeriodInBlocks(@Parent() energyContract: GovernanceEnergyContract): Promise<number> {
return this.governanceAbi.votingPeriodInBlocks(energyContract.address);
}

@ResolveField()
async feeTokenId(@Parent() energyContract: EnergyContract): Promise<string> {
async feeTokenId(@Parent() energyContract: GovernanceEnergyContract): Promise<string> {
return this.governanceAbi.feeTokenId(energyContract.address);
}

@ResolveField()
async withdrawPercentageDefeated(@Parent() energyContract: EnergyContract): Promise<number> {
async withdrawPercentageDefeated(@Parent() energyContract: GovernanceEnergyContract): Promise<number> {
return this.governanceAbi.withdrawPercentageDefeated(energyContract.address);
}

@ResolveField(() => [GovernanceProposal])
async proposals(@Parent() energyContract: EnergyContract): Promise<GovernanceProposal[]> {
async proposals(@Parent() energyContract: GovernanceEnergyContract): Promise<GovernanceProposal[]> {
return this.governanceAbi.proposals(energyContract.address);
}

@ResolveField()
async feesCollectorAddress(@Parent() energyContract: EnergyContract): Promise<string> {
async feesCollectorAddress(@Parent() energyContract: GovernanceEnergyContract): Promise<string> {
return this.governanceAbi.feesCollectorAddress(energyContract.address);
}

@ResolveField()
async energyFactoryAddress(@Parent() energyContract: EnergyContract): Promise<string> {
async energyFactoryAddress(@Parent() energyContract: GovernanceEnergyContract): Promise<string> {
return this.governanceAbi.energyFactoryAddress(energyContract.address);
}
}
4 changes: 2 additions & 2 deletions src/modules/governance/governance.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -28,7 +28,7 @@ import { GovernanceService } from './services/governance.service';
// GovernanceComputeService,
// GovernanceTransactionService,
GovernanceQueryResolver,
EnergyContractResolver,
GovernanceEnergyContractResolver,
GovernanceProposalResolver,
],
exports: [
Expand Down
4 changes: 2 additions & 2 deletions src/modules/governance/models/energy.contract.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export enum GovernanceType {
registerEnumType(GovernanceType, { name: 'GovernanceType' });

@ObjectType()
export class EnergyContract {
export class GovernanceEnergyContract {
@Field()
address: string;
@Field()
Expand All @@ -33,7 +33,7 @@ export class EnergyContract {
@Field()
energyFactoryAddress: string;

constructor(init: Partial<EnergyContract>) {
constructor(init: Partial<GovernanceEnergyContract>) {
Object.assign(this, init);
}
}
8 changes: 4 additions & 4 deletions src/modules/governance/models/governance.union.ts
Original file line number Diff line number Diff line change
@@ -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;
}
},
});
6 changes: 3 additions & 3 deletions src/modules/governance/services/governance.service.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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) {
Expand All @@ -27,7 +27,7 @@ export class GovernanceService {
switch (type) {
case GovernanceType.ENERGY:
governance.push(
new EnergyContract({
new GovernanceEnergyContract({
address,
}),
);
Expand Down

0 comments on commit 1894fae

Please sign in to comment.