Skip to content

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

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
MarcoPolo merged 3 commits into from
Jul 5, 2023
Merged

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

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39da25f
fix(interop): use standaloneTransports as string instead of param
mxinden Jul 5, 2023
37d8b8a
Nit
MarcoPolo Jul 5, 2023
724a003
Merge branch 'master' into interop-sql-array-param
MarcoPolo Jul 5, 2023
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
6 changes: 3 additions & 3 deletions multidim-interop/src/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export async function buildTestSpecs(versions: Array<Version>, nameFilter: strin
// Generate the testing combinations by SELECT'ing from both transports
// and muxers tables the distinct combinations where the transport and the muxer
// 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 =
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
Expand All @@ -67,14 +67,14 @@ export async function buildTestSpecs(versions: Array<Version>, nameFilter: strin
AND sa.sec == sb.sec
AND ma.muxer == mb.muxer
-- These transports don't define muxers/securechannels
AND a.transport NOT IN ($standaloneTransports);`, { $standaloneTransports: standaloneTransports });
AND a.transport NOT IN (${standaloneTransports});`);
const standaloneTransportsQueryResults =
await db.all(`SELECT DISTINCT a.id as id1, b.id as id2, a.transport
FROM transports a, transports b
WHERE a.transport == b.transport
AND NOT b.onlyDial
-- These transports don't define muxers/securechannels
AND a.transport IN ($standaloneTransports);`, { $standaloneTransports: standaloneTransports });
AND a.transport IN (${standaloneTransports});`);
await db.close();

const testSpecs = queryResults.map((test): ComposeSpecification => (
Expand Down