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

See https://github.com/multiformats/multiaddr/pull/150#issuecomment-1468791586
for context on discussion.

- Renames the `webrtc` transport identifier to `webrtc-direct`.
- Re-enables `webrtc-direct` support for rust-libp2p v0.51. Previously disabled
  in https://github.com/libp2p/test-plans/pull/160. See
  https://github.com/libp2p/rust-libp2p/pull/3781 for corresponding change on
  the rust-libp2p side.
- Leaves JS v0.41 and v0.42 untouched. To be done in a follow-up alongside JS
  dependency updates.
This commit is contained in:
Max Inden 2023-04-19 13:48:07 +02:00 committed by GitHub
parent b80483a3f3
commit e07ffabbe8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 8 deletions

View File

@ -117,6 +117,8 @@ func main() {
case "webtransport":
fallthrough
case "webrtc":
fallthrough
case "webrtc-direct":
skipMuxer = true
skipSecureChannel = true
}

View File

@ -1,5 +1,5 @@
image_name := rust-v0.51
commitSha := 1a9cf4f7760724032b729c43165716c7ecd842ad
commitSha := 0d5cac0cb595702567e50221fed9ae525b4c6f20
all: image.json

View File

@ -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"
AND a.transport != "webrtc-direct"
AND a.transport != "quic"
AND a.transport != "quic-v1";`);
const quicQueryResults =
@ -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 => (
@ -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,
@ -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
}
}

View File

@ -48,7 +48,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"],
},