From 31d7ad731e169d5ac62202b74abfa7b41bac90d6 Mon Sep 17 00:00:00 2001 From: gmega Date: Thu, 24 Aug 2023 13:34:13 -0300 Subject: [PATCH] remove message type checks and uncheckedDeliver --- swarmsim/codex/dhttracker.nim | 4 ++-- swarmsim/engine/protocol.nim | 12 ++---------- tests/helpers/inbox.nim | 2 +- 3 files changed, 5 insertions(+), 13 deletions(-) diff --git a/swarmsim/codex/dhttracker.nim b/swarmsim/codex/dhttracker.nim index ae586ea..4681a52 100644 --- a/swarmsim/codex/dhttracker.nim +++ b/swarmsim/codex/dhttracker.nim @@ -109,8 +109,8 @@ method atScheduledTime*(self: ExpirationTimer, engine: EventDrivenEngine): void proc sampleSwarm(self: DHTTracker, message: SampleSwarm, network: Network) = discard -method uncheckedDeliver*(self: DHTTracker, message: Message, - engine: EventDrivenEngine, network: Network) = +method deliver*(self: DHTTracker, message: Message, engine: EventDrivenEngine, + network: Network) = if message of PeerAnnouncement: self.addPeer(PeerAnnouncement(message), engine) diff --git a/swarmsim/engine/protocol.nim b/swarmsim/engine/protocol.nim index 806970f..1420465 100644 --- a/swarmsim/engine/protocol.nim +++ b/swarmsim/engine/protocol.nim @@ -7,16 +7,8 @@ export eventdrivenengine export Protocol export Message -method uncheckedDeliver( - self: Protocol, - message: Message, - engine: EventDrivenEngine, - network: Network -): void {.base.} = +method deliver*(self: Protocol, message: Message, engine: EventDrivenEngine, + network: Network): void {.base.} = raise newException(CatchableError, "Method without implementation override") -proc deliver*(self: Protocol, message: Message, engine: EventDrivenEngine, - network: Network): void = - self.uncheckedDeliver(message, engine, network) - proc protocolName*[T: Protocol](self: type T): string = name(T) diff --git a/tests/helpers/inbox.nim b/tests/helpers/inbox.nim index 8a7a645..ea72197 100644 --- a/tests/helpers/inbox.nim +++ b/tests/helpers/inbox.nim @@ -7,7 +7,7 @@ type Inbox* = ref object of Protocol messages*: seq[Message] -method uncheckedDeliver*( +method deliver*( self: Inbox, message: Message, engine: EventDrivenEngine,