status-im
/
libp2p-test-plans
mirror of https://github.com/status-im/libp2p-test-plans.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(interop): use standaloneTransports as string instead of param (#219) 

* fix(interop): use standaloneTransports as string instead of param

When generating the test specification (docker-compose file) we enumerate all
transport permutations. While some of our transports need to be upgraded (e.g.
TCP and WS) some don't (e.g. QUIC or WebRTC). To differentiate the two we
execute two SQL queries (`queryResults` and `standaloneTransportsQueryResults`),
each with either a `AND _ NOT IN` or `AND _ IN`.

The previous implementation would use `node-sqlite3` query parameters (see
https://github.com/TryGhost/node-sqlite3/wiki/API#runsql--param---callback) to
provide the list of transport protocols that don't need upgrading as an array.

The problem is that `node-sqlite3` does not support arrays as query parameters,
see https://github.com/TryGhost/node-sqlite3/issues/762.

This commit uses string interpolation instead to inject the list of standalone
transports into the SQL queries.

* Nit

---------

Co-authored-by: Marco Munizaga <git@marcopolo.io>
Co-authored-by: Marco Munizaga <marco@marcopolo.io>
This commit is contained in:
Max Inden 2023-07-06 01:57:30 +02:00 committed by GitHub
parent ec32d36cab
commit 465065cff8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
multidim-interop/src/generator.ts
View File

@ -54,7 +54,7 @@ export async function buildTestSpecs(versions: Array<Version>, nameFilter: strin
// Generate the testing combinations by SELECT'ing from both transports // Generate the testing combinations by SELECT'ing from both transports
// and muxers tables the distinct combinations where the transport and the muxer // and muxers tables the distinct combinations where the transport and the muxer
// of the different libp2p implementations match. // of the different libp2p implementations match.
const standaloneTransports = ["quic", "quic-v1", "webtransport", "webrtc", "webrtc-direct"] const standaloneTransports = ["quic", "quic-v1", "webtransport", "webrtc", "webrtc-direct"].map(x => `"${x}"`).join(", ")
const queryResults = const queryResults =
await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport, ma.muxer, sa.sec await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport, ma.muxer, sa.sec
FROM transports a, transports b, muxers ma, muxers mb, secureChannels sa, secureChannels sb FROM transports a, transports b, muxers ma, muxers mb, secureChannels sa, secureChannels sb
@ -67,14 +67,14 @@ export async function buildTestSpecs(versions: Array<Version>, nameFilter: strin
AND sa.sec == sb.sec AND sa.sec == sb.sec
AND ma.muxer == mb.muxer AND ma.muxer == mb.muxer
-- These transports don't define muxers/securechannels -- These transports don't define muxers/securechannels
AND a.transport NOT IN ($standaloneTransports);`, { $standaloneTransports: standaloneTransports }); AND a.transport NOT IN (${standaloneTransports});`);
const standaloneTransportsQueryResults = const standaloneTransportsQueryResults =
await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport
FROM transports a, transports b FROM transports a, transports b
WHERE a.transport == b.transport WHERE a.transport == b.transport
AND NOT b.onlyDial AND NOT b.onlyDial
-- These transports don't define muxers/securechannels -- These transports don't define muxers/securechannels
AND a.transport IN ($standaloneTransports);`, { $standaloneTransports: standaloneTransports }); AND a.transport IN (${standaloneTransports});`);
await db.close(); await db.close();
const testSpecs = queryResults.map((test): ComposeSpecification => ( const testSpecs = queryResults.map((test): ComposeSpecification => (