From 7e707ba7acae84b17fdb4b9affdeac9208749577 Mon Sep 17 00:00:00 2001 From: Kinflou Date: Sun, 1 Nov 2026 17:14:41 +0800 Subject: [PATCH] conformance: pin the runtime at conformance spec 0.2, with the exact-decimal json compare Moves comline-runtime-conformance and the test reference to the runtime branch that adds spec 0.2 (handshake_check, the comline@1 profile) and reads 1 and 1.0 as the same number under compare: json (runtime#71). The reference test now expects the comline@1 handshake profile. --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- tests/cli/conformance.rs | 3 +++ tests/fixtures/conformance/Cargo.lock | 6 +++--- tests/fixtures/conformance/Cargo.toml | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d2ce868..763aa8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -654,7 +654,7 @@ dependencies = [ [[package]] name = "comline-runtime" version = "0.1.0" -source = "git+https://github.com/ComlineProject/runtime?rev=6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6#6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6" +source = "git+https://github.com/ComlineProject/runtime?rev=4378c91b74ee1ef1debc800a3daf75c874198e70#4378c91b74ee1ef1debc800a3daf75c874198e70" dependencies = [ "abi_stable", "bytemuck", @@ -668,7 +668,7 @@ dependencies = [ [[package]] name = "comline-runtime-conformance" version = "0.1.0" -source = "git+https://github.com/ComlineProject/runtime?rev=6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6#6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6" +source = "git+https://github.com/ComlineProject/runtime?rev=4378c91b74ee1ef1debc800a3daf75c874198e70#4378c91b74ee1ef1debc800a3daf75c874198e70" dependencies = [ "comline-runtime", "serde", diff --git a/Cargo.toml b/Cargo.toml index 8ba85bf..566658a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -48,7 +48,7 @@ comline-codegen-rust = { git = "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/ComlineProject/comline-rust", comline-codegen-typescript = { git = "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/ComlineProject/comline-typescript", rev = "932edaad1fd0a0dba47f8fff132149e03c0340dc", optional = true } # `comline conformance`: the conformance runner (corpus loading, judging, # profile proofs) and its case format, a public spec. Pinned by git rev. -comline-runtime-conformance = { git = "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/ComlineProject/runtime", rev = "6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6" } +comline-runtime-conformance = { git = "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/ComlineProject/runtime", rev = "4378c91b74ee1ef1debc800a3daf75c874198e70" } # Runs a `generator = ".wasm"` target (see src/external.rs): no # preopened directories, no environment, no network. Exact pins, bumped # together. diff --git a/tests/cli/conformance.rs b/tests/cli/conformance.rs index 152cd58..75c28c6 100644 --- a/tests/cli/conformance.rs +++ b/tests/cli/conformance.rs @@ -81,6 +81,9 @@ fn the_reference_passes_every_official_encoding() { .assert() .success() .stderr(predicate::str::contains("packed@1 (format): ")) + // Spec 0.2: the `comline@1` handshake profile's `handshake_check` + // cases load, and the reference answers them. + .stderr(predicate::str::contains("comline@1 (handshake): ")) .stderr(predicate::str::contains("failed").not()) .stderr(predicate::str::contains("unproven").not()) .stderr(predicate::str::contains( diff --git a/tests/fixtures/conformance/Cargo.lock b/tests/fixtures/conformance/Cargo.lock index eb50361..97b1626 100644 --- a/tests/fixtures/conformance/Cargo.lock +++ b/tests/fixtures/conformance/Cargo.lock @@ -103,7 +103,7 @@ checksum = "4e7648175b45a9a48536d676f68d918270699102aa8dab5496df06904c914600" [[package]] name = "comline-reference" version = "0.1.0" -source = "git+https://github.com/ComlineProject/runtime?rev=6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6#6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6" +source = "git+https://github.com/ComlineProject/runtime?rev=4378c91b74ee1ef1debc800a3daf75c874198e70#4378c91b74ee1ef1debc800a3daf75c874198e70" dependencies = [ "comline-runtime", "comline-runtime-conformance", @@ -114,7 +114,7 @@ dependencies = [ [[package]] name = "comline-runtime" version = "0.1.0" -source = "git+https://github.com/ComlineProject/runtime?rev=6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6#6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6" +source = "git+https://github.com/ComlineProject/runtime?rev=4378c91b74ee1ef1debc800a3daf75c874198e70#4378c91b74ee1ef1debc800a3daf75c874198e70" dependencies = [ "abi_stable", "bytemuck", @@ -128,7 +128,7 @@ dependencies = [ [[package]] name = "comline-runtime-conformance" version = "0.1.0" -source = "git+https://github.com/ComlineProject/runtime?rev=6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6#6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6" +source = "git+https://github.com/ComlineProject/runtime?rev=4378c91b74ee1ef1debc800a3daf75c874198e70#4378c91b74ee1ef1debc800a3daf75c874198e70" dependencies = [ "comline-runtime", "serde", diff --git a/tests/fixtures/conformance/Cargo.toml b/tests/fixtures/conformance/Cargo.toml index 6cb30a5..4d48beb 100644 --- a/tests/fixtures/conformance/Cargo.toml +++ b/tests/fixtures/conformance/Cargo.toml @@ -12,5 +12,5 @@ publish = false [dependencies] # The runtime rev the CLI pins `comline-runtime-conformance` at, so the # reference answers as the vectors the CLI reads were blessed. -comline-reference = { git = "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/ComlineProject/runtime", rev = "6f8f73a247f0aa4ac8b7041b2fdc4b02bce0e0d6" } +comline-reference = { git = "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/ComlineProject/runtime", rev = "4378c91b74ee1ef1debc800a3daf75c874198e70" } serde_json = "1.0"