From 35fe8ace04e64c4c6ca678149b045ca86d04c3d6 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 7 May 2026 09:37:11 +0000 Subject: [PATCH 1/6] Test service-provider --- .../evm-state/source/service-provider.test.ts | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 packages/evm-state/source/service-provider.test.ts diff --git a/packages/evm-state/source/service-provider.test.ts b/packages/evm-state/source/service-provider.test.ts new file mode 100644 index 000000000..114aba232 --- /dev/null +++ b/packages/evm-state/source/service-provider.test.ts @@ -0,0 +1,24 @@ +import { Identifiers } from "@mainsail/constants"; + +import { Application } from "@mainsail/kernel"; + +import { describe } from "@mainsail/test-runner"; +import { ServiceProvider } from "./service-provider"; + +describe<{ + app: Application; + serviceProvider: ServiceProvider; +}>("ServiceProvider", ({ beforeEach, it, assert }) => { + beforeEach((context) => { + const app = new Application(); + + context.serviceProvider = app.resolve(ServiceProvider); + context.app = app; + }); + + it("#register - should be ok", async ({ serviceProvider, app }) => { + await serviceProvider.register(); + + assert.true(app.isBound(Identifiers.Evm.State)); + }); +}); From 29ac3a125b23042f17c24f549e32b53139a3c800 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 7 May 2026 09:39:34 +0000 Subject: [PATCH 2/6] Rename variable --- packages/api-evm/source/actions/net-peer-count.ts | 2 +- packages/contracts/source/contracts/evm/state.ts | 2 +- packages/evm-api-worker/source/handlers/set-peer-count.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/api-evm/source/actions/net-peer-count.ts b/packages/api-evm/source/actions/net-peer-count.ts index fd268250d..ded11c6b8 100644 --- a/packages/api-evm/source/actions/net-peer-count.ts +++ b/packages/api-evm/source/actions/net-peer-count.ts @@ -17,6 +17,6 @@ export class NetPeerCountAction implements Contracts.Api.RPC.Action { }; public async handle(parameters: []): Promise { - return `0x${Number(this.state.peerCount).toString(16)}`; + return `0x${Number(this.state.peersCount).toString(16)}`; } } diff --git a/packages/contracts/source/contracts/evm/state.ts b/packages/contracts/source/contracts/evm/state.ts index aaffb77f4..ff2997825 100644 --- a/packages/contracts/source/contracts/evm/state.ts +++ b/packages/contracts/source/contracts/evm/state.ts @@ -1,3 +1,3 @@ export interface State { - peerCount: number; + peersCount: number; } diff --git a/packages/evm-api-worker/source/handlers/set-peer-count.ts b/packages/evm-api-worker/source/handlers/set-peer-count.ts index 099cc5f56..cc892ee78 100644 --- a/packages/evm-api-worker/source/handlers/set-peer-count.ts +++ b/packages/evm-api-worker/source/handlers/set-peer-count.ts @@ -9,6 +9,6 @@ export class SetPeerCountHandler { private readonly state!: Contracts.Evm.State; public async handle(peerCount: number): Promise { - this.state.peerCount = peerCount; + this.state.peersCount = peerCount; } } From d42c72b7838579caea5506512f77f7f13df1271f Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 7 May 2026 09:40:20 +0000 Subject: [PATCH 3/6] Rename parameter --- packages/evm-api-worker/source/handlers/set-peer-count.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/evm-api-worker/source/handlers/set-peer-count.ts b/packages/evm-api-worker/source/handlers/set-peer-count.ts index cc892ee78..a3a6ad985 100644 --- a/packages/evm-api-worker/source/handlers/set-peer-count.ts +++ b/packages/evm-api-worker/source/handlers/set-peer-count.ts @@ -8,7 +8,7 @@ export class SetPeerCountHandler { @inject(Identifiers.Evm.State) private readonly state!: Contracts.Evm.State; - public async handle(peerCount: number): Promise { - this.state.peersCount = peerCount; + public async handle(peersCount: number): Promise { + this.state.peersCount = peersCount; } } From cffbae39c0b5dc3b10ebbfb472590cd794a0eac0 Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 7 May 2026 09:43:55 +0000 Subject: [PATCH 4/6] Test state --- packages/evm-state/source/state.test.ts | 25 +++++++++++++++++++++++++ packages/evm-state/source/state.ts | 2 +- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 packages/evm-state/source/state.test.ts diff --git a/packages/evm-state/source/state.test.ts b/packages/evm-state/source/state.test.ts new file mode 100644 index 000000000..1c39b183f --- /dev/null +++ b/packages/evm-state/source/state.test.ts @@ -0,0 +1,25 @@ +import { Identifiers } from "@mainsail/constants"; + +import { Application } from "@mainsail/kernel"; +import type { Contracts } from "@mainsail/contracts"; + +import { describe } from "@mainsail/test-runner"; +import { State } from "./state"; + +describe<{ + state: Contracts.Evm.State; +}>("ServiceProvider", ({ beforeEach, it, assert }) => { + beforeEach((context) => { + const app = new Application(); + context.state = app.resolve(State); + }); + + it("#peersCount - should have default value 0", async ({ state, app }) => { + assert.equal(state.peersCount, 0); + }); + + it("#peersCount - should be set and read", async ({ state }) => { + state.peersCount = 5; + assert.equal(state.peersCount, 5); + }); +}); diff --git a/packages/evm-state/source/state.ts b/packages/evm-state/source/state.ts index 2d9463ff6..b744a177d 100644 --- a/packages/evm-state/source/state.ts +++ b/packages/evm-state/source/state.ts @@ -4,5 +4,5 @@ import { injectable } from "@mainsail/container"; @injectable() export class State implements Contracts.Evm.State { - public peerCount = 0; + public peersCount = 0; } From cafea02c1506e28acae4cf6efcd558511166a89c Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 7 May 2026 09:46:37 +0000 Subject: [PATCH 5/6] Fix test --- packages/evm-state/source/state.test.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/evm-state/source/state.test.ts b/packages/evm-state/source/state.test.ts index 1c39b183f..acf9a82eb 100644 --- a/packages/evm-state/source/state.test.ts +++ b/packages/evm-state/source/state.test.ts @@ -1,5 +1,3 @@ -import { Identifiers } from "@mainsail/constants"; - import { Application } from "@mainsail/kernel"; import type { Contracts } from "@mainsail/contracts"; From 4addc605b4f0f98968d7c8d316ef03ac066a5e6b Mon Sep 17 00:00:00 2001 From: sebastijankuzner Date: Thu, 7 May 2026 10:47:50 +0000 Subject: [PATCH 6/6] Rename variable --- packages/api-evm/source/actions/net-peer-count.ts | 2 +- packages/contracts/source/contracts/evm/state.ts | 2 +- .../evm-api-worker/source/handlers/set-peer-count.ts | 4 ++-- packages/evm-state/source/state.test.ts | 10 +++++----- packages/evm-state/source/state.ts | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/api-evm/source/actions/net-peer-count.ts b/packages/api-evm/source/actions/net-peer-count.ts index ded11c6b8..fd268250d 100644 --- a/packages/api-evm/source/actions/net-peer-count.ts +++ b/packages/api-evm/source/actions/net-peer-count.ts @@ -17,6 +17,6 @@ export class NetPeerCountAction implements Contracts.Api.RPC.Action { }; public async handle(parameters: []): Promise { - return `0x${Number(this.state.peersCount).toString(16)}`; + return `0x${Number(this.state.peerCount).toString(16)}`; } } diff --git a/packages/contracts/source/contracts/evm/state.ts b/packages/contracts/source/contracts/evm/state.ts index ff2997825..aaffb77f4 100644 --- a/packages/contracts/source/contracts/evm/state.ts +++ b/packages/contracts/source/contracts/evm/state.ts @@ -1,3 +1,3 @@ export interface State { - peersCount: number; + peerCount: number; } diff --git a/packages/evm-api-worker/source/handlers/set-peer-count.ts b/packages/evm-api-worker/source/handlers/set-peer-count.ts index a3a6ad985..099cc5f56 100644 --- a/packages/evm-api-worker/source/handlers/set-peer-count.ts +++ b/packages/evm-api-worker/source/handlers/set-peer-count.ts @@ -8,7 +8,7 @@ export class SetPeerCountHandler { @inject(Identifiers.Evm.State) private readonly state!: Contracts.Evm.State; - public async handle(peersCount: number): Promise { - this.state.peersCount = peersCount; + public async handle(peerCount: number): Promise { + this.state.peerCount = peerCount; } } diff --git a/packages/evm-state/source/state.test.ts b/packages/evm-state/source/state.test.ts index acf9a82eb..dffb87443 100644 --- a/packages/evm-state/source/state.test.ts +++ b/packages/evm-state/source/state.test.ts @@ -12,12 +12,12 @@ describe<{ context.state = app.resolve(State); }); - it("#peersCount - should have default value 0", async ({ state, app }) => { - assert.equal(state.peersCount, 0); + it("#peerCount - should have default value 0", async ({ state }) => { + assert.equal(state.peerCount, 0); }); - it("#peersCount - should be set and read", async ({ state }) => { - state.peersCount = 5; - assert.equal(state.peersCount, 5); + it("#peerCount - should be set and read", async ({ state }) => { + state.peerCount = 5; + assert.equal(state.peerCount, 5); }); }); diff --git a/packages/evm-state/source/state.ts b/packages/evm-state/source/state.ts index b744a177d..2d9463ff6 100644 --- a/packages/evm-state/source/state.ts +++ b/packages/evm-state/source/state.ts @@ -4,5 +4,5 @@ import { injectable } from "@mainsail/container"; @injectable() export class State implements Contracts.Evm.State { - public peersCount = 0; + public peerCount = 0; }