Skip to content

test: reorganise libp2p tests #1911

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Nov 24, 2025
Merged

test: reorganise libp2p tests #1911

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f95368e
org libp2p tests
rlve Nov 24, 2025
51718e9
org integration tests
rlve Nov 24, 2025
3189ad9
format
rlve Nov 24, 2025
38d21d7
Update tests/libp2p/pubsub/integration/testgossipsubcontrolmessages.nim
rlve Nov 24, 2025
52269b0
missing headers
rlve Nov 24, 2025
b51fcec
add test_all
rlve Nov 24, 2025
d596503
remove ignore
rlve Nov 24, 2025
b66c64b
update nimble file
rlve Nov 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/.licenserc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,4 @@ header:
- "**/*.nim"
paths-ignore:
- "examples/**"
- "tests/multiformat_exts/*_exts.nim"
comment: on-failure
2 changes: 1 addition & 1 deletion .github/workflows/daily_common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,4 +92,4 @@ jobs:
run: |
nim --version
nimble --version
nim r -d:libp2p_autotls_support -d:chronicles_log_level=DEBUG tests/autotls/test_integration.nim
nim r -d:libp2p_autotls_support -d:chronicles_log_level=DEBUG tests/integration/test_all.nim
18 changes: 9 additions & 9 deletions libp2p.nimble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,18 @@ proc tutorialToMd(filename: string) =

task testmultiformatexts, "Run multiformat extensions tests":
let opts =
"-d:libp2p_multicodec_exts=../tests/multiformat_exts/multicodec_exts.nim " &
"-d:libp2p_multiaddress_exts=../tests/multiformat_exts/multiaddress_exts.nim " &
"-d:libp2p_multihash_exts=../tests/multiformat_exts/multihash_exts.nim " &
"-d:libp2p_multibase_exts=../tests/multiformat_exts/multibase_exts.nim " &
"-d:libp2p_contentids_exts=../tests/multiformat_exts/contentids_exts.nim "
runTest("multiformat_exts/test_all", opts)
"-d:libp2p_multicodec_exts=../tests/libp2p/multiformat_exts/multicodec_exts.nim " &
"-d:libp2p_multiaddress_exts=../tests/libp2p/multiformat_exts/multiaddress_exts.nim " &
"-d:libp2p_multihash_exts=../tests/libp2p/multiformat_exts/multihash_exts.nim " &
"-d:libp2p_multibase_exts=../tests/libp2p/multiformat_exts/multibase_exts.nim " &
"-d:libp2p_contentids_exts=../tests/libp2p/multiformat_exts/contentids_exts.nim "
runTest("libp2p/multiformat_exts/test_all", opts)

task testpubsub, "Runs pubsub tests":
runTest("pubsub/test_all", "-d:libp2p_gossipsub_1_4")
runTest("libp2p/pubsub/test_all", "-d:libp2p_gossipsub_1_4")

task testintegration, "Runs integraion tests":
runTest("testintegration")
task testintegration, "Runs integration tests":
runTest("integration/test_all")

task test, "Runs the test suite":
runTest("test_all")
Expand Down
4 changes: 1 addition & 3 deletions tests/autotls/test_integration.nim → tests/integration/test_all.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,4 @@ when defined(linux) and defined(amd64):
# those terms.

when defined(libp2p_autotls_support):
import test_autotls_integration, test_peeridauth_integration

import ../transports/test_ws_integration
import test_autotls_integration, test_peeridauth_integration, test_ws_integration
0 tests/autotls/test_autotls_integration.nim → .../integration/test_autotls_integration.nim
View file
Open in desktop
File renamed without changes.
0 ...s/autotls/test_peeridauth_integration.nim → ...tegration/test_peeridauth_integration.nim
View file
Open in desktop
File renamed without changes.
0 tests/transports/test_ws_integration.nim → tests/integration/test_ws_integration.nim
View file
Open in desktop
File renamed without changes.
0 tests/autotls/test_all.nim → tests/libp2p/autotls/test_all.nim
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/autotls/test_autotls.nim → tests/libp2p/autotls/test_autotls.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ when defined(libp2p_autotls_support):

import sequtils, json, uri, chronos, chronos/apps/http/httpclient
import
../../libp2p/[
../../../libp2p/[
stream/connection,
upgrademngrs/upgrade,
autotls/acme/mockapi,
autotls/acme/client,
wire,
]
import ../tools/[unittest]
import ../../tools/[unittest]

suite "AutoTLS ACME API":
var api {.threadvar.}: MockACMEApi
Expand Down
4 changes: 2 additions & 2 deletions tests/autotls/test_autotls_config.nim → tests/libp2p/autotls/test_autotls_config.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
{.push raises: [].}

import chronos, uri
import ../../libp2p/[autotls/service, autotls/acme/api, autotls/acme/client, wire]
import ../tools/[unittest]
import ../../../libp2p/[autotls/service, autotls/acme/api, autotls/acme/client, wire]
import ../../tools/[unittest]

suite "AutoTLS Configuration Tests":
asyncTeardown:
Expand Down
4 changes: 2 additions & 2 deletions tests/autotls/test_peeridauth.nim → tests/libp2p/autotls/test_peeridauth.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@

import chronos, chronos/apps/http/httpclient, uri, base64, times
import
../../libp2p/
../../../libp2p/
[
stream/connection,
upgrademngrs/upgrade,
peeridauth/mockclient,
wire,
crypto/crypto,
]
import ../tools/[unittest, crypto]
import ../../tools/[unittest, crypto]

suite "PeerID Auth Client":
var client {.threadvar.}: MockPeerIDAuthClient
Expand Down
0 tests/crypto/test_all.nim → tests/libp2p/crypto/test_all.nim
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/crypto/testcrypto.nim → tests/libp2p/crypto/testcrypto.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

from std/strutils import toUpper
import bearssl/hash, nimcrypto/utils
import ../../libp2p/crypto/[crypto, chacha20poly1305, curve25519, hkdf]
import ../tools/[unittest, crypto]
import ../../../libp2p/crypto/[crypto, chacha20poly1305, curve25519, hkdf]
import ../../tools/[unittest, crypto]

## Test vectors was made using Go implementation
## https://github.com/libp2p/go-libp2p-crypto/blob/master/key.go
Expand Down
4 changes: 2 additions & 2 deletions tests/crypto/testecnist.nim → tests/libp2p/crypto/testecnist.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import results, nimcrypto/utils
import ../../libp2p/crypto/[crypto, ecnist]
import ../tools/[unittest, crypto]
import ../../../libp2p/crypto/[crypto, ecnist]
import ../../tools/[unittest, crypto]

const
TestsCount = 10 # number of random tests
Expand Down
4 changes: 2 additions & 2 deletions tests/crypto/tested25519.nim → tests/libp2p/crypto/tested25519.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import nimcrypto/utils
import ../../libp2p/crypto/[crypto, ed25519/ed25519]
import ../tools/[unittest, crypto]
import ../../../libp2p/crypto/[crypto, ed25519/ed25519]
import ../../tools/[unittest, crypto]

## Test vectors are from RFC 8032 (https://tools.ietf.org/html/rfc8032)

Expand Down
4 changes: 2 additions & 2 deletions tests/crypto/testminasn1.nim → tests/libp2p/crypto/testminasn1.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import nimcrypto/utils as ncrutils
import ../../libp2p/crypto/minasn1
import ../tools/[unittest]
import ../../../libp2p/crypto/minasn1
import ../../tools/[unittest]

const Asn1EdgeValues = [
0'u64,
Expand Down
4 changes: 2 additions & 2 deletions tests/crypto/testpkifilter.nim → tests/libp2p/crypto/testpkifilter.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ when defined(nimHasUsed):
{.used.}

import nimcrypto/utils
import ../../libp2p/crypto/crypto
import ../tools/[unittest, crypto]
import ../../../libp2p/crypto/crypto
import ../../tools/[unittest, crypto]

const ECDSA_PrivateKey =
"""
Expand Down
4 changes: 2 additions & 2 deletions tests/crypto/testrsa.nim → tests/libp2p/crypto/testrsa.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import nimcrypto/utils
import ../../libp2p/crypto/[crypto, rsa]
import ../tools/[unittest, crypto]
import ../../../libp2p/crypto/[crypto, rsa]
import ../../tools/[unittest, crypto]

const
NotAllowedPrivateKeys = [
Expand Down
4 changes: 2 additions & 2 deletions tests/crypto/testsecp256k1.nim → tests/libp2p/crypto/testsecp256k1.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

{.used.}

import ../../libp2p/crypto/[crypto, secp]
import ../tools/[unittest, crypto]
import ../../../libp2p/crypto/[crypto, secp]
import ../../tools/[unittest, crypto]

suite "Secp256k1 testing suite":
const TestsCount = 20
Expand Down
0 tests/discovery/test_all.nim → tests/libp2p/discovery/test_all.nim
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/discovery/testrendezvous.nim → tests/libp2p/discovery/testrendezvous.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import sequtils, strformat, sugar, chronos, stew/byteutils
import
../../libp2p/[
../../../libp2p/[
protocols/rendezvous,
protocols/rendezvous/protobuf,
peerinfo,
Expand All @@ -24,7 +24,7 @@ import
builders,
utils/offsettedseq,
]
import ../tools/[unittest]
import ../../tools/[unittest]
import ./utils

type CustomPeerRecord* = object
Expand Down
4 changes: 2 additions & 2 deletions tests/discovery/testrendezvouserrors.nim → ...libp2p/discovery/testrendezvouserrors.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@

import sequtils, strformat, strutils, chronos
import
../../libp2p/[
../../../libp2p/[
protocols/rendezvous,
protocols/rendezvous/protobuf,
peerinfo,
switch,
routing_record,
crypto/crypto,
]
import ../tools/[unittest]
import ../../tools/[unittest]
import ./utils

suite "RendezVous Errors":
Expand Down
4 changes: 2 additions & 2 deletions tests/discovery/testrendezvousprotobuf.nim → ...bp2p/discovery/testrendezvousprotobuf.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

{.used.}

import ../../libp2p/[protocols/rendezvous/protobuf, protobuf/minprotobuf]
import ../tools/[unittest]
import ../../../libp2p/[protocols/rendezvous/protobuf, protobuf/minprotobuf]
import ../../tools/[unittest]

suite "RendezVous Protobuf":
teardown:
Expand Down
4 changes: 2 additions & 2 deletions tests/discovery/utils.nim → tests/libp2p/discovery/utils.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

import chronos, sequtils
import
../../libp2p/[
../../../libp2p/[
builders,
crypto/crypto,
peerid,
Expand All @@ -19,7 +19,7 @@ import
routing_record,
switch,
]
import ../tools/[crypto]
import ../../tools/[crypto]

proc createSwitch*(): Switch =
SwitchBuilder
Expand Down
0 tests/kademlia/test_all.nim → tests/libp2p/kademlia/test_all.nim
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/kademlia/testencoding.nim → tests/libp2p/kademlia/testencoding.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@

import nimcrypto, results
import
../../libp2p/[
../../../libp2p/[
multiaddress,
peerid,
protobuf/minprotobuf,
protocols/kademlia,
protocols/kademlia/protobuf,
]
import ../tools/unittest
import ../../tools/unittest

template checkEncodeDecode(obj: untyped) =
check obj == decode(typeof(obj), obj.encode()).get()
Expand Down
4 changes: 2 additions & 2 deletions tests/kademlia/testfindnode.nim → tests/libp2p/kademlia/testfindnode.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import chronicles, chronos, std/[sequtils, enumerate]
import ../../libp2p/[protocols/kademlia, switch, builders]
import ../tools/[unittest]
import ../../../libp2p/[protocols/kademlia, switch, builders]
import ../../tools/[unittest]
import ./utils.nim

proc hasKey(kad: KadDHT, key: Key): bool =
Expand Down
4 changes: 2 additions & 2 deletions tests/kademlia/testgetval.nim → tests/libp2p/kademlia/testgetval.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@

from std/times import now, utc
import chronos
import ../../libp2p/[protocols/kademlia, switch, builders]
import ../tools/[unittest]
import ../../../libp2p/[protocols/kademlia, switch, builders]
import ../../tools/[unittest]
import ./utils.nim

suite "KadDHT - GetVal":
Expand Down
4 changes: 2 additions & 2 deletions tests/kademlia/testping.nim → tests/libp2p/kademlia/testping.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import chronos
import ../../libp2p/[protocols/kademlia, switch, builders]
import ../tools/[unittest]
import ../../../libp2p/[protocols/kademlia, switch, builders]
import ../../tools/[unittest]
import ./utils.nim

suite "KadDHT - Ping":
Expand Down
4 changes: 2 additions & 2 deletions tests/kademlia/testprovider.nim → tests/libp2p/kademlia/testprovider.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import std/[tables, sets, sequtils]
from std/times import now, utc
import chronos, chronicles
import ../../libp2p/[protocols/kademlia, switch, builders, multicodec]
import ../tools/[unittest]
import ../../../libp2p/[protocols/kademlia, switch, builders, multicodec]
import ../../tools/[unittest]
import ./utils.nim

suite "KadDHT - ProviderManager":
Expand Down
4 changes: 2 additions & 2 deletions tests/kademlia/testputval.nim → tests/libp2p/kademlia/testputval.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import std/[times, tables], chronos
import ../../libp2p/[protocols/kademlia, switch, builders]
import ../tools/[unittest]
import ../../../libp2p/[protocols/kademlia, switch, builders]
import ../../tools/[unittest]
import ./utils.nim

suite "KadDHT - PutVal":
Expand Down
4 changes: 2 additions & 2 deletions tests/kademlia/testroutingtable.nim → tests/libp2p/kademlia/testroutingtable.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import chronos, results
import ../../libp2p/[protocols/kademlia, crypto/crypto]
import ../tools/[unittest, crypto]
import ../../../libp2p/[protocols/kademlia, crypto/crypto]
import ../../tools/[unittest, crypto]

proc testKey*(x: byte): Key =
var buf: array[IdLength, byte]
Expand Down
4 changes: 2 additions & 2 deletions tests/kademlia/testxordistance.nim → tests/libp2p/kademlia/testxordistance.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import chronos
import ../../libp2p/protocols/kademlia
import ../tools/[unittest]
import ../../../libp2p/protocols/kademlia
import ../../tools/[unittest]

suite "xor distance":
test "countLeadingZeroBits works":
Expand Down
2 changes: 1 addition & 1 deletion tests/kademlia/utils.nim → tests/libp2p/kademlia/utils.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{.used.}

import std/tables, results, chronos
import ../../libp2p/[protocols/kademlia, switch, builders]
import ../../../libp2p/[protocols/kademlia, switch, builders]

type PermissiveValidator* = ref object of EntryValidator
method isValid*(self: PermissiveValidator, key: Key, record: EntryRecord): bool =
Expand Down
0 tests/mix/test_all.nim → tests/libp2p/mix/test_all.nim
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions tests/mix/test_conn.nim → tests/libp2p/mix/test_conn.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

import chronos, results, options, std/[enumerate, sequtils, tables], stew/byteutils
import
../../libp2p/[
../../../libp2p/[
protocols/mix,
protocols/mix/mix_node,
protocols/mix/mix_protocol,
Expand All @@ -24,7 +24,7 @@ import
crypto/secp,
]

import ../tools/[unittest, crypto]
import ../../tools/[unittest, crypto]

proc createSwitch(
multiAddr: MultiAddress, libp2pPrivKey: Opt[SkPrivateKey] = Opt.none(SkPrivateKey)
Expand Down
4 changes: 2 additions & 2 deletions tests/mix/test_crypto.nim → tests/libp2p/mix/test_crypto.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import nimcrypto, results
import ../../libp2p/protocols/mix/crypto
import ../tools/[unittest]
import ../../../libp2p/protocols/mix/crypto
import ../../tools/[unittest]

suite "cryptographic_functions_tests":
test "aes_ctr_encrypt_decrypt":
Expand Down
4 changes: 2 additions & 2 deletions tests/mix/test_curve25519.nim → tests/libp2p/mix/test_curve25519.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
{.used.}

import results
import ../../libp2p/[crypto/curve25519, protocols/mix/curve25519]
import ../tools/[unittest]
import ../../../libp2p/[crypto/curve25519, protocols/mix/curve25519]
import ../../tools/[unittest]

proc isNotZero(key: FieldElement): bool =
for byte in key:
Expand Down
5 changes: 3 additions & 2 deletions tests/mix/test_fragmentation.nim → tests/libp2p/mix/test_fragmentation.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@
{.used.}

import results
import ../../libp2p/[peerid, protocols/mix/serialization, protocols/mix/fragmentation]
import ../tools/[unittest]
import
../../../libp2p/[peerid, protocols/mix/serialization, protocols/mix/fragmentation]
import ../../tools/[unittest]

suite "Fragmentation":
let peerId =
Expand Down
Loading
Loading