Skip to content

fix(interop): rename webrtc to webrtc-direct #166

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
mxinden merged 2 commits into from
Apr 19, 2023
Merged

fix(interop): rename webrtc to webrtc-direct #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46e7674
fix(interop): rename `webrtc` to `webrtc-direct`
mxinden Apr 12, 2023
eeba3fb
Update git sha to commit using webrtc-direct
mxinden Apr 12, 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
2 changes: 2 additions & 0 deletions multidim-interop/impl/go/v0.24/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@ func main() {
case "webtransport":
fallthrough
case "webrtc":
fallthrough
case "webrtc-direct":
skipMuxer = true
skipSecureChannel = true
}
Expand Down
2 changes: 1 addition & 1 deletion multidim-interop/impl/rust/v0.51/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
image_name := rust-v0.51
commitSha := 1a9cf4f7760724032b729c43165716c7ecd842ad
commitSha := 0d5cac0cb595702567e50221fed9ae525b4c6f20

all: image.json

Expand Down
12 changes: 6 additions & 6 deletions multidim-interop/src/generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export async function buildTestSpecs(versions: Array<Version>): Promise<Array<Co
AND ma.muxer == mb.muxer
-- quic only uses its own muxer/securechannel
AND a.transport != "webtransport"
AND a.transport != "webrtc"
Copy link
Copy Markdown
Contributor

@MarcoPolo MarcoPolo Apr 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we want both here, right? but not needed right now

Copy link
Copy Markdown
Contributor

@MarcoPolo MarcoPolo Apr 15, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll add this when we add webrtc tests here :)

AND a.transport != "webrtc-direct"
AND a.transport != "quic"
AND a.transport != "quic-v1";`);
const quicQueryResults =
Expand All @@ -85,13 +85,13 @@ export async function buildTestSpecs(versions: Array<Version>): Promise<Array<Co
AND NOT b.onlyDial
-- Only webtransport transports
AND a.transport == "webtransport";`);
const webrtcQueryResults =
const webrtcDirectQueryResults =
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
-- Only webrtc transports
AND a.transport == "webrtc";`);
-- Only webrtc-direct transports
AND a.transport == "webrtc-direct";`);
await db.close();

const testSpecs = queryResults.map((test): ComposeSpecification => (
Expand All @@ -115,7 +115,7 @@ export async function buildTestSpecs(versions: Array<Version>): Promise<Array<Co
transport: test.transport,
extraEnv: buildExtraEnv(timeoutOverride, test.id1, test.id2)
})))
.concat(webrtcQueryResults
.concat(webrtcDirectQueryResults
.map((test): ComposeSpecification => buildSpec(containerImages, {
name: `${test.id1} x ${test.id2} (${test.transport})`,
dialerID: test.id1,
Expand Down Expand Up @@ -172,4 +172,4 @@ function buildSpec(containerImages: { [key: string]: string }, { name, dialerID,

function normalizeTransport(transport: string | { name: string, onlyDial: boolean }): { name: string, onlyDial: boolean } {
return typeof transport === "string" ? { name: transport, onlyDial: false } : transport
}
}
2 changes: 1 addition & 1 deletion multidim-interop/versions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export const versions: Array<Version> = [
{
id: "rust-v0.51.0",
containerImageID: rustv051.imageID,
transports: ["ws", "tcp", "quic-v1"],
transports: ["ws", "tcp", "quic-v1", "webrtc-direct"],
secureChannels: ["tls", "noise"],
muxers: ["mplex", "yamux"],
},
Expand Down