From 4cf1b793e269e8b1381c973faa5c5c6fc0b9b7ac Mon Sep 17 00:00:00 2001 From: Jaremy Creechley Date: Fri, 18 Aug 2023 16:09:04 -0700 Subject: [PATCH] import tweaks --- swarmsim/codex/dhttracker.nim | 9 +++------ swarmsim/engine.nim | 6 ++++++ tests/engine/teventdrivenengine.nim | 4 ++-- tests/engine/tnetwork.nim | 8 ++++---- tests/engine/tpeer.nim | 2 +- tests/engine/tschedulableevent.nim | 2 +- 6 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 swarmsim/engine.nim diff --git a/swarmsim/codex/dhttracker.nim b/swarmsim/codex/dhttracker.nim index 444db4d..a62c6ce 100644 --- a/swarmsim/codex/dhttracker.nim +++ b/swarmsim/codex/dhttracker.nim @@ -1,13 +1,10 @@ -import ../engine/protocol -import ../engine/network -import ../engine/schedulableevent -import ../timeutils - import std/times import std/options import std/algorithm import std/tables -import sequtils +import std/sequtils + +import ../engine export protocol export options diff --git a/swarmsim/engine.nim b/swarmsim/engine.nim new file mode 100644 index 0000000..87939d0 --- /dev/null +++ b/swarmsim/engine.nim @@ -0,0 +1,6 @@ +import engine/protocol +import engine/network +import engine/schedulableevent +import timeutils + +export protocol, network, schedulableevent, timeutils \ No newline at end of file diff --git a/tests/engine/teventdrivenengine.nim b/tests/engine/teventdrivenengine.nim index cf980a5..2983fd6 100644 --- a/tests/engine/teventdrivenengine.nim +++ b/tests/engine/teventdrivenengine.nim @@ -4,8 +4,8 @@ import sugar import std/algorithm -import pkg/swarmsim/engine/schedulableevent -import pkg/swarmsim/engine/eventdrivenengine +import swarmsim/engine/schedulableevent +import swarmsim/engine/eventdrivenengine type TestSchedulable = ref object of SchedulableEvent diff --git a/tests/engine/tnetwork.nim b/tests/engine/tnetwork.nim index f1558fa..95e88a8 100644 --- a/tests/engine/tnetwork.nim +++ b/tests/engine/tnetwork.nim @@ -1,9 +1,9 @@ import unittest -import pkg/swarmsim/engine/eventdrivenengine -import pkg/swarmsim/engine/network -import pkg/swarmsim/engine/peer -import pkg/swarmsim/engine/protocol +import swarmsim/engine/eventdrivenengine +import swarmsim/engine/network +import swarmsim/engine/peer +import swarmsim/engine/protocol type FakeProtocol = ref object of Protocol diff --git a/tests/engine/tpeer.nim b/tests/engine/tpeer.nim index 73f76da..76a67a7 100644 --- a/tests/engine/tpeer.nim +++ b/tests/engine/tpeer.nim @@ -1,7 +1,7 @@ import std/unittest import std/sets -import pkg/swarmsim/engine/peer +import swarmsim/engine/peer suite "peer": test "should allow inclusion and membership tests on a HashSet": diff --git a/tests/engine/tschedulableevent.nim b/tests/engine/tschedulableevent.nim index 5bfd762..370d581 100644 --- a/tests/engine/tschedulableevent.nim +++ b/tests/engine/tschedulableevent.nim @@ -1,6 +1,6 @@ import unittest -import pkg/swarmsim/engine/schedulableevent +import swarmsim/engine/schedulableevent suite "schedulable event": test "should be ordered by time":