From 379d593daf2f3203ab82bf8d6139325b3dc36420 Mon Sep 17 00:00:00 2001 From: benedettadavico Date: Mon, 7 Nov 2022 18:37:31 +0100 Subject: [PATCH] Updating more tests --- .../mixnode/contract-cache-mixnode.test.ts | 20 +++--- .../status/status-mixnode.test.ts | 66 ++++++++----------- validator-api/tests/src/config/config.yaml | 4 +- .../tests/src/config/configHandler.ts | 2 +- validator-api/tests/src/endpoints/Status.ts | 46 +++++-------- 5 files changed, 59 insertions(+), 79 deletions(-) diff --git a/validator-api/tests/functional_test/validator-api/contract_cache/mixnode/contract-cache-mixnode.test.ts b/validator-api/tests/functional_test/validator-api/contract_cache/mixnode/contract-cache-mixnode.test.ts index d3e68a61b9..8cdcfb3a46 100644 --- a/validator-api/tests/functional_test/validator-api/contract_cache/mixnode/contract-cache-mixnode.test.ts +++ b/validator-api/tests/functional_test/validator-api/contract_cache/mixnode/contract-cache-mixnode.test.ts @@ -20,7 +20,7 @@ describe("Get mixnode data", (): void => { expect(typeof mixnode.bond_information.owner).toBe('string'); expect(typeof mixnode.bond_information.original_pledge.amount).toBe('string'); expect(typeof mixnode.bond_information.original_pledge.denom).toBe('string'); - expect(typeof mixnode.bond_information.layer).toBe('string'); + expect(typeof mixnode.bond_information.layer).toBe('number'); expect(typeof mixnode.bond_information.bonding_height).toBe('number'); expect(typeof mixnode.bond_information.is_unbonding).toBe('boolean'); @@ -33,12 +33,11 @@ describe("Get mixnode data", (): void => { //mixnode expect(typeof mixnode.bond_information.mix_node.host).toBe('string') - expect(typeof mixnode.bond_information.mix_node.http_api_port).toStrictEqual(8000); + expect(mixnode.bond_information.mix_node.http_api_port).toStrictEqual(8000); expect(typeof mixnode.bond_information.mix_node.verloc_port).toBe('number') expect(typeof mixnode.bond_information.mix_node.mix_port).toBe('number') - expect(typeof mixnode.bond_information.mix_node.sphinx_key).toBe('number') - expect(typeof mixnode.bond_information.mix_node.mix_port).toStrictEqual(1789); - expect(typeof mixnode.bond_information.mix_node.verloc_port).toStrictEqual(1790) + expect(mixnode.bond_information.mix_node.mix_port).toStrictEqual(1789); + expect(mixnode.bond_information.mix_node.verloc_port).toStrictEqual(1790) let identitykey = mixnode.bond_information.mix_node.identity_key if (typeof identitykey === 'string') { @@ -81,11 +80,11 @@ describe("Get mixnode data", (): void => { expect(typeof mixnode.stake_saturation).toBe('string'); //mixnode details bond info - expect(typeof mixnode.mixnode_details.bond_information.mix_id).toBe('string') + expect(typeof mixnode.mixnode_details.bond_information.mix_id).toBe('number') expect(typeof mixnode.mixnode_details.bond_information.owner).toBe('string'); expect(typeof mixnode.mixnode_details.bond_information.original_pledge.amount).toBe('string'); expect(typeof mixnode.mixnode_details.bond_information.original_pledge.denom).toBe('string'); - expect(typeof mixnode.mixnode_details.bond_information.layer).toBe('string'); + expect(typeof mixnode.mixnode_details.bond_information.layer).toBe('number'); expect(typeof mixnode.mixnode_details.bond_information.bonding_height).toBe('number'); expect(typeof mixnode.mixnode_details.bond_information.is_unbonding).toBe('boolean'); @@ -98,12 +97,11 @@ describe("Get mixnode data", (): void => { //mixnode expect(typeof mixnode.mixnode_details.bond_information.mix_node.host).toBe('string') - expect(typeof mixnode.mixnode_details.bond_information.mix_node.http_api_port).toStrictEqual(8000); + expect(mixnode.mixnode_details.bond_information.mix_node.http_api_port).toStrictEqual(8000); expect(typeof mixnode.mixnode_details.bond_information.mix_node.verloc_port).toBe('number') expect(typeof mixnode.mixnode_details.bond_information.mix_node.mix_port).toBe('number') - expect(typeof mixnode.mixnode_details.bond_information.mix_node.sphinx_key).toBe('number') - expect(typeof mixnode.mixnode_details.bond_information.mix_node.mix_port).toStrictEqual(1789); - expect(typeof mixnode.mixnode_details.bond_information.mix_node.verloc_port).toStrictEqual(1790) + expect(mixnode.mixnode_details.bond_information.mix_node.mix_port).toStrictEqual(1789); + expect(mixnode.mixnode_details.bond_information.mix_node.verloc_port).toStrictEqual(1790) let identitykey2 = mixnode.mixnode_details.bond_information.mix_node.identity_key if (typeof identitykey2 === 'string') { diff --git a/validator-api/tests/functional_test/validator-api/status/status-mixnode.test.ts b/validator-api/tests/functional_test/validator-api/status/status-mixnode.test.ts index a94a038966..135e3d62c1 100644 --- a/validator-api/tests/functional_test/validator-api/status/status-mixnode.test.ts +++ b/validator-api/tests/functional_test/validator-api/status/status-mixnode.test.ts @@ -11,21 +11,22 @@ describe("Get mixnode data", (): void => { }); it("Get a mixnode stake saturation", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeStakeSaturation(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeStakeSaturation(mix_id); 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 status report", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeStatusReport(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeStatusReport(mix_id); - expect(identity_key).toStrictEqual(response.identity); + expect(mix_id).toStrictEqual(response.mix_id); expect(typeof response.owner).toBe("string"); expect(typeof response.most_recent).toBe("number"); expect(typeof response.last_hour).toBe("number"); @@ -33,29 +34,20 @@ describe("Get mixnode data", (): void => { }); it("Get a mixnode average uptime", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeAverageUptime(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeAverageUptime(mix_id); console.log(response.avg_uptime); console.log(response.mix_id); - expect(identity_key).toStrictEqual(response.mix_id); + expect(mix_id).toStrictEqual(response.mix_id); expect(typeof response.avg_uptime).toBe("number"); }); - it("Get all mixnodes average uptime", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getAllMixnodeAverageUptime(identity_key); - - response.forEach((mixnode) => { - expect(typeof mixnode.avg_uptime).toBe("number"); - expect(typeof mixnode.mix_id).toBe("string"); - }); - }); it("Get a mixnode history", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeHistory(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeHistory(mix_id); response.history.forEach((x) => { console.log(x.date); @@ -67,24 +59,24 @@ describe("Get mixnode data", (): void => { console.log(response.identity); console.log(response.owner); - expect(identity_key).toStrictEqual(response.identity); + expect(mix_id).toStrictEqual(response.mix_id); expect(typeof response.owner).toBe("string"); }); it("Get mixnode core status count", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeCoreCount(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeCoreCount(mix_id); console.log(response.count); console.log(response.mix_id); - expect(identity_key).toStrictEqual(response.mix_id); + expect(mix_id).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 response = await status.getMixnodeStatus(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeStatus(mix_id); console.log(response.status); @@ -92,8 +84,8 @@ describe("Get mixnode data", (): void => { }); it("Get a mixnode reward estimation", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeRewardComputation(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeRewardComputation(mix_id); //estimation expect(typeof response.estimation.total_node_reward).toBe("string"); @@ -110,8 +102,8 @@ describe("Get mixnode data", (): void => { expect(typeof response.reward_params.interval.sybil_resistance).toBe("string"); expect(typeof response.reward_params.interval.active_set_work_factor).toBe("string"); expect(typeof response.reward_params.interval.interval_pool_emission).toBe("string"); - expect(typeof response.reward_params.rewarded_set_size).toBe("string"); - expect(typeof response.reward_params.active_set_size).toBe("string"); + expect(typeof response.reward_params.rewarded_set_size).toBe("number"); + expect(typeof response.reward_params.active_set_size).toBe("number"); //epoch expect(typeof response.epoch.id).toBe("number"); @@ -128,8 +120,8 @@ describe("Get mixnode data", (): void => { }); it("Get a mixnode inclusion probability", async (): Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeInclusionProbability(identity_key); + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeInclusionProbability(mix_id); console.log(response.in_active); console.log(response.in_reserve); @@ -138,9 +130,9 @@ describe("Get mixnode data", (): void => { expect(typeof response.in_reserve).toBe("string"); }); - it("Post to compute mixnode reward estimation", async ():Promise => { - const identity_key = config.environmnetConfig.mixnode_identity; - const response = await status.getMixnodeRewardEstimatedComputation(identity_key); + it.skip("Post to compute mixnode reward estimation", async ():Promise => { + const mix_id = config.environmnetConfig.mixnode_identity; + const response = await status.getMixnodeRewardEstimatedComputation(mix_id); //estimation expect(typeof response.estimation.total_node_reward).toBe("string"); @@ -157,8 +149,8 @@ describe("Get mixnode data", (): void => { expect(typeof response.reward_params.interval.sybil_resistance).toBe("string"); expect(typeof response.reward_params.interval.active_set_work_factor).toBe("string"); expect(typeof response.reward_params.interval.interval_pool_emission).toBe("string"); - expect(typeof response.reward_params.rewarded_set_size).toBe("string"); - expect(typeof response.reward_params.active_set_size).toBe("string"); + expect(typeof response.reward_params.rewarded_set_size).toBe("number"); + expect(typeof response.reward_params.active_set_size).toBe("number"); //epoch expect(typeof response.epoch.id).toBe("number"); diff --git a/validator-api/tests/src/config/config.yaml b/validator-api/tests/src/config/config.yaml index 5981efed07..5b95458af6 100644 --- a/validator-api/tests/src/config/config.yaml +++ b/validator-api/tests/src/config/config.yaml @@ -2,8 +2,8 @@ common: request_headers: Accept: application/json Content-Type: application/json -qwerty: - api_base_url: https://qwerty-validator-api.qa.nymte.ch/v1 +qa: + api_base_url: https://qwerty-validator-api.qa.nymte.ch/api/v1 mixnode_identity: 7 gateway_identity: 336yuXAeGEgedRfqTJZsG2YV7P13QH1bHv1SjCZYarc9 log_level: error diff --git a/validator-api/tests/src/config/configHandler.ts b/validator-api/tests/src/config/configHandler.ts index 482282a9ed..adaff2a973 100644 --- a/validator-api/tests/src/config/configHandler.ts +++ b/validator-api/tests/src/config/configHandler.ts @@ -16,7 +16,7 @@ class ConfigHandler { log_level: TLogLevelName; time_zone: string; api_base_url: string; - mixnode_identity: string; + mixnode_identity: number; gateway_identity: string; }; diff --git a/validator-api/tests/src/endpoints/Status.ts b/validator-api/tests/src/endpoints/Status.ts index a4898a19b6..643ac1e0fb 100644 --- a/validator-api/tests/src/endpoints/Status.ts +++ b/validator-api/tests/src/endpoints/Status.ts @@ -17,9 +17,9 @@ export default class Status extends APIClient { super("/status"); } - public async getMixnodeStatusReport(identity_key: string): Promise { + public async getMixnodeStatusReport(mix_id: number): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/report`, + route: `/mixnode/${mix_id}/report`, }); return response.data; @@ -41,27 +41,27 @@ export default class Status extends APIClient { return response.data; } - 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 response.data; } public async getMixnodeStakeSaturation( - identity_key: string + mix_id: number ): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/stake-saturation`, + route: `/mixnode/${mix_id}/stake-saturation`, }); return response.data; } - public async getMixnodeCoreCount(identity_key: string): Promise { + public async getMixnodeCoreCount(mix_id: number): Promise { const response = await this.restClient.sendGet({ - route: `/mixnode/${identity_key}/core-status-count`, + route: `/mixnode/${mix_id}/core-status-count`, }); return response.data; @@ -76,20 +76,20 @@ export default class Status extends APIClient { } 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 response.data; } 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`, data: { "performance": "", // TO-DO add a value to this "active_in_rewarded_set": true, @@ -107,38 +107,28 @@ 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`, - }); - - return response.data; - } - - public async getAllMixnodeAverageUptime( - identity_key: string - ): Promise { - const response = await this.restClient.sendGet({ - route: `/mixnodes/avg_uptime`, + route: `/mixnode/${mix_id}/avg_uptime`, }); return response.data; } 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 response.data; } - 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 response.data;