From f14a87809ef1d4ecb86b620a4bfbde7b2f1b3cd1 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Fri, 6 Jan 2023 17:04:22 +0100 Subject: [PATCH] editing tests --- .../contract-cache-epochs.test.ts | 4 +- .../gateway/contract-cache-gateway.test.ts | 4 +- .../mixnode/contract-cache-mixnode.test.ts | 4 +- .../status/status-gateway.test.ts | 4 +- .../status/status-mixnode.test.ts | 33 +++--- nym-api/tests/src/endpoints/Status.ts | 111 ++++++++++-------- .../tests/src/interfaces/StatusInterfaces.ts | 7 +- nym-api/tests/tsconfig.json | 2 +- 8 files changed, 91 insertions(+), 78 deletions(-) rename nym-api/tests/functional_test/{validator-api => }/contract_cache/contract-cache-epochs.test.ts (92%) rename nym-api/tests/functional_test/{validator-api => }/contract_cache/gateway/contract-cache-gateway.test.ts (91%) rename nym-api/tests/functional_test/{validator-api => }/contract_cache/mixnode/contract-cache-mixnode.test.ts (98%) rename nym-api/tests/functional_test/{validator-api => }/status/status-gateway.test.ts (92%) rename nym-api/tests/functional_test/{validator-api => }/status/status-mixnode.test.ts (77%) diff --git a/nym-api/tests/functional_test/validator-api/contract_cache/contract-cache-epochs.test.ts b/nym-api/tests/functional_test/contract_cache/contract-cache-epochs.test.ts similarity index 92% rename from nym-api/tests/functional_test/validator-api/contract_cache/contract-cache-epochs.test.ts rename to nym-api/tests/functional_test/contract_cache/contract-cache-epochs.test.ts index 5451478081..11239d01be 100644 --- a/nym-api/tests/functional_test/validator-api/contract_cache/contract-cache-epochs.test.ts +++ b/nym-api/tests/functional_test/contract_cache/contract-cache-epochs.test.ts @@ -1,5 +1,5 @@ -import ContractCache from "../../../src/endpoints/ContractCache"; -import ConfigHandler from "../../../src/config/configHandler"; +import ContractCache from "../../src/endpoints/ContractCache"; +import ConfigHandler from "../../src/config/configHandler"; let contract: ContractCache; let config: ConfigHandler; diff --git a/nym-api/tests/functional_test/validator-api/contract_cache/gateway/contract-cache-gateway.test.ts b/nym-api/tests/functional_test/contract_cache/gateway/contract-cache-gateway.test.ts similarity index 91% rename from nym-api/tests/functional_test/validator-api/contract_cache/gateway/contract-cache-gateway.test.ts rename to nym-api/tests/functional_test/contract_cache/gateway/contract-cache-gateway.test.ts index efc4b48a76..6f1546f2d2 100644 --- a/nym-api/tests/functional_test/validator-api/contract_cache/gateway/contract-cache-gateway.test.ts +++ b/nym-api/tests/functional_test/contract_cache/gateway/contract-cache-gateway.test.ts @@ -1,5 +1,5 @@ -import ContractCache from "../../../../src/endpoints/ContractCache"; -import ConfigHandler from "../../../../src/config/configHandler"; +import ContractCache from "../../../src/endpoints/ContractCache"; +import ConfigHandler from "../../../src/config/configHandler"; let contract: ContractCache; let config: ConfigHandler; diff --git a/nym-api/tests/functional_test/validator-api/contract_cache/mixnode/contract-cache-mixnode.test.ts b/nym-api/tests/functional_test/contract_cache/mixnode/contract-cache-mixnode.test.ts similarity index 98% rename from nym-api/tests/functional_test/validator-api/contract_cache/mixnode/contract-cache-mixnode.test.ts rename to nym-api/tests/functional_test/contract_cache/mixnode/contract-cache-mixnode.test.ts index 744d583bfb..3b134a3353 100644 --- a/nym-api/tests/functional_test/validator-api/contract_cache/mixnode/contract-cache-mixnode.test.ts +++ b/nym-api/tests/functional_test/contract_cache/mixnode/contract-cache-mixnode.test.ts @@ -1,5 +1,5 @@ -import ContractCache from "../../../../src/endpoints/ContractCache"; -import ConfigHandler from "../../../../src/config/configHandler"; +import ContractCache from "../../../src/endpoints/ContractCache"; +import ConfigHandler from "../../../src/config/configHandler"; let contract: ContractCache; let config: ConfigHandler; diff --git a/nym-api/tests/functional_test/validator-api/status/status-gateway.test.ts b/nym-api/tests/functional_test/status/status-gateway.test.ts similarity index 92% rename from nym-api/tests/functional_test/validator-api/status/status-gateway.test.ts rename to nym-api/tests/functional_test/status/status-gateway.test.ts index b3153ea80e..973d1ae9e1 100644 --- a/nym-api/tests/functional_test/validator-api/status/status-gateway.test.ts +++ b/nym-api/tests/functional_test/status/status-gateway.test.ts @@ -1,5 +1,5 @@ -import Status from "../../../src/endpoints/Status"; -import ConfigHandler from "../../../src/config/configHandler"; +import Status from "../../src/endpoints/Status"; +import ConfigHandler from "../../src/config/configHandler"; let status: Status; let config: ConfigHandler; diff --git a/nym-api/tests/functional_test/validator-api/status/status-mixnode.test.ts b/nym-api/tests/functional_test/status/status-mixnode.test.ts similarity index 77% rename from nym-api/tests/functional_test/validator-api/status/status-mixnode.test.ts rename to nym-api/tests/functional_test/status/status-mixnode.test.ts index 58542fafae..bbfb17a61f 100644 --- a/nym-api/tests/functional_test/validator-api/status/status-mixnode.test.ts +++ b/nym-api/tests/functional_test/status/status-mixnode.test.ts @@ -1,5 +1,5 @@ -import Status from "../../../src/endpoints/Status"; -import ConfigHandler from "../../../src/config/configHandler"; +import Status from "../../src/endpoints/Status"; +import ConfigHandler from "../../src/config/configHandler"; let status: Status; let config: ConfigHandler; @@ -11,39 +11,40 @@ describe("Get mixnode data", (): void => { }); it("Get a mixnode stake saturation", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; + const identity_key = config.environmnetConfig.mix_id; const response = await status.getMixnodeStakeSaturation(identity_key); console.log(response.as_at); console.log(response.saturation); expect(typeof response.as_at).toBe("number"); - expect(typeof response.saturation).toBe("number"); + expect(typeof response.saturation).toBe("string"); + expect(typeof response.uncapped_saturation).toBe("string"); }); it("Get a mixnode average uptime", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; + const identity_key = config.environmnetConfig.mix_id; const response = await status.getMixnodeAverageUptime(identity_key); console.log(response.avg_uptime); - console.log(response.identity); + console.log(response.mix_id); - expect(identity_key).toStrictEqual(response.identity); + expect(identity_key).toStrictEqual(response.mix_id); expect(typeof response.avg_uptime).toBe("number"); }); it("Get a mixnode history", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; + const identity_key = config.environmnetConfig.mix_id; const response = await status.getMixnodeHistory(identity_key); response.history.forEach((x) => { console.log(x.date); console.log(x.uptime); }); - console.log(response.identity); + console.log(response.mix_id); console.log(response.owner); - expect(identity_key).toStrictEqual(response.identity); + expect(identity_key).toStrictEqual(response.mix_id); expect(typeof response.owner).toBe("string"); }); @@ -74,18 +75,18 @@ describe("Get mixnode data", (): void => { }); it("Get a gateway history", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; + const identity_key = config.environmnetConfig.mix_id; const response = await status.getMixnodeCoreCount(identity_key); console.log(response.count); - console.log(response.identity); + console.log(response.mix_id); - expect(identity_key).toStrictEqual(response.identity); + expect(identity_key).toStrictEqual(response.mix_id); expect(typeof response.count).toBe("number"); }); it("Get a mixnode status", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; + const identity_key = config.environmnetConfig.mix_id; const response = await status.getMixnodeStatus(identity_key); console.log(response.status); @@ -94,7 +95,7 @@ describe("Get mixnode data", (): void => { }); it("Get a mixnode reward estimation", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; + const identity_key = config.environmnetConfig.mix_id; const response = await status.getMixnodeRewardComputation(identity_key); console.log(response.estimated_delegators_reward); @@ -111,7 +112,7 @@ describe("Get mixnode data", (): void => { }); it("Get a mixnode inclusion probability", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; + const identity_key = config.environmnetConfig.mix_id; const response = await status.getMixnodeInclusionProbability(identity_key); console.log(response.in_active); diff --git a/nym-api/tests/src/endpoints/Status.ts b/nym-api/tests/src/endpoints/Status.ts index 8c0576f524..9f19186bb2 100644 --- a/nym-api/tests/src/endpoints/Status.ts +++ b/nym-api/tests/src/endpoints/Status.ts @@ -15,20 +15,8 @@ export default class Status extends APIClient { constructor() { super("/status"); } - - public async getMixnodeStatusReport(identity_key: string): Promise { - const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/report`, - }); - - return { - identity: response.data.identity, - owner: response.data.owner, - most_recent: response.data.most_recent, - last_hour: response.data.last_hour, - last_day: response.data.last_day, - }; - } + + // GATEWAYS public async getGatewayStatusReport(identity_key: string): Promise { const response = await this.restClient.sendGet({ @@ -56,30 +44,6 @@ export default class Status extends APIClient { }; } - public async getMixnodeStakeSaturation( - identity_key: string - ): Promise { - const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/stake-saturation`, - }); - - return { - as_at: response.data.as_at, - saturation: response.data.saturation, - }; - } - - public async getMixnodeCoreCount(identity_key: string): Promise { - const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/core-status-count`, - }); - - return { - identity: response.data.identity, - count: response.data.count, - }; - } - public async getGatewayCoreCount(identity_key: string): Promise { const response = await this.restClient.sendGet({ route: `/gateway/${identity_key}/core-status-count`, @@ -91,11 +55,55 @@ export default class Status extends APIClient { }; } + + // MIXNODES + + public async getMixnodeStatusReport(mix_id: number): Promise { + const response = await this.restClient.sendGet({ + route: `/mixnode/${mix_id}/report`, + }); + + return { + mix_id: response.data.mix_id, + identity: response.data.identity, + owner: response.data.owner, + most_recent: response.data.most_recent, + last_hour: response.data.last_hour, + last_day: response.data.last_day, + }; + } + + public async getMixnodeStakeSaturation( + mix_id: number + ): Promise { + const response = await this.restClient.sendGet({ + route: `/mixnode/${mix_id}/stake-saturation`, + }); + + return { + as_at: response.data.as_at, + saturation: response.data.saturation, + uncapped_saturation: response.uncapped_saturation, + }; + } + + public async getMixnodeCoreCount(mix_id: number): Promise { + const response = await this.restClient.sendGet({ + route: `/mixnode/${mix_id}/core-status-count`, + }); + + return { + mix_id: response.data.mix_id, + identity: response.data.identity, + count: response.data.count, + }; + } + public async getMixnodeRewardComputation( - identity_key: string + mix_id: number ): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/reward-estimation`, + route: `/mixnode/${mix_id}/reward-estimation`, }); return { @@ -110,10 +118,10 @@ export default class Status extends APIClient { } public async getMixnodeRewardEstimatedComputation( - identity_key: string + mix_id: number ): Promise { const response = await this.restClient.sendPost({ - route: `/mixnode/${identity_key}/compute-reward-estimation`, + route: `/mixnode/${mix_id}/compute-reward-estimation`, }); return { @@ -127,12 +135,13 @@ export default class Status extends APIClient { }; } - public async getMixnodeHistory(identity_key: string): Promise { + public async getMixnodeHistory(mix_id: number): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/history`, + route: `/mixnode/${mix_id}/history`, }); return { + mix_id: response.data.mix_id, identity: response.data.identity, owner: response.data.owner, history: response.data.history, @@ -140,23 +149,23 @@ export default class Status extends APIClient { } public async getMixnodeAverageUptime( - identity_key: string + mix_id: number ): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/avg_uptime`, + route: `/mixnode/${mix_id}/avg_uptime`, }); return { - identity: response.data.identity, + mix_id: response.data.mix_id, avg_uptime: response.data.avg_uptime, }; } public async getMixnodeInclusionProbability( - identity_key: string + mix_id: number ): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/inclusion-probability`, + route: `/mixnode/${mix_id}/inclusion-probability`, }); return { @@ -165,9 +174,9 @@ export default class Status extends APIClient { }; } - public async getMixnodeStatus(identity_key: string): Promise { + public async getMixnodeStatus(mix_id: number): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/status`, + route: `/mixnode/${mix_id}/status`, }); return { diff --git a/nym-api/tests/src/interfaces/StatusInterfaces.ts b/nym-api/tests/src/interfaces/StatusInterfaces.ts index d6a7d91498..9d1a1ee201 100644 --- a/nym-api/tests/src/interfaces/StatusInterfaces.ts +++ b/nym-api/tests/src/interfaces/StatusInterfaces.ts @@ -29,12 +29,13 @@ export type EstimatedReward = { }; export type StakeSaturation = { - saturation: number; + saturation: string; + uncapped_saturation: string; as_at: number; }; export type AvgUptime = { - identity: string; + mix_id: number; avg_uptime: number; }; @@ -57,12 +58,14 @@ export type History = { }; export type NodeHistory = { + mix_id: number, identity: string; owner: string; history: History[]; }; export type CoreCount = { + mix_id: number, identity: string; count: number; }; diff --git a/nym-api/tests/tsconfig.json b/nym-api/tests/tsconfig.json index c25d4218fa..0b41cfdf67 100644 --- a/nym-api/tests/tsconfig.json +++ b/nym-api/tests/tsconfig.json @@ -20,6 +20,6 @@ "typeRoots": ["node_modules/@types"], "alwaysStrict": true }, - "include": ["src/**/*", "functional_test/**/*"], + "include": ["src/**/*", "functional_test/*/*"], "exclude": ["unit_test/**/*"] }