From 9c863741a1867ef2eeaa4ff0c3f138e9dafad5a5 Mon Sep 17 00:00:00 2001
From: Jade Lovelace <lix@jade.fyi>
Date: Thu, 23 May 2024 22:16:59 -0700
Subject: [PATCH] Delete old ValidPathInfo test, fix UnkeyedValidPathInfo

The UnkeyedValidPathInfo test was testing an ancient version but not the
current version. Doesn't make much sense to me.

Change-Id: Ib476a4297d9075f2dcd31a073b3e7b149b2189af
---
 .../unkeyed-valid-path-info-1.15.bin          | Bin 328 -> 0 bytes
 .../unkeyed-valid-path-info.bin               | Bin 0 -> 376 bytes
 .../worker-protocol/valid-path-info-1.15.bin  | Bin 488 -> 0 bytes
 ...path-info-1.16.bin => valid-path-info.bin} | Bin
 tests/unit/libstore/worker-protocol.cc        |  63 +++---------------
 5 files changed, 8 insertions(+), 55 deletions(-)
 delete mode 100644 tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
 create mode 100644 tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info.bin
 delete mode 100644 tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.15.bin
 rename tests/unit/libstore/data/libstore/worker-protocol/{valid-path-info-1.16.bin => valid-path-info.bin} (100%)

diff --git a/tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin b/tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info-1.15.bin
deleted file mode 100644
index e69ccbe83862b29e3f79810c0c2ff4561a42f86f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 328
zcmbu4%?`pK5QOo8D!&WM#q>Qq0R{CUX=_wYUVUsEAs(9a<XmQx%}l-_q^fVuA<6)n
zp;f_qVHiS48ay}=gXgFagSA#!lN3nqwPnT`KpvtVK$uoTUdMVJ-qmG$(Cg(%=Ubj4
rJ@JP*7ddWu=iRg)ru#S9xBS0+yVkSGQ%YHLjf)n}F6I2=S?~J*budbz

diff --git a/tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info.bin b/tests/unit/libstore/data/libstore/worker-protocol/unkeyed-valid-path-info.bin
new file mode 100644
index 0000000000000000000000000000000000000000..7bf72e0f4f726252663a39a5d86c1e35c43abf0b
GIT binary patch
literal 376
zcmbu4%?iRW5QO6c)%<Rfy-44~Q<5g?#n4vNoV@zj78^Z?1;M$@GBCrpgv@HIbBHp4
zW)@ZOUKnN}Bn=*%h{1EKtPO~$&?E(tdyULE1D1!VI}oPMklS{?HuqQZ-DQpG@o=T%
uDG!nE_{Hpt?3cXpZdiB2`Ppo1|6lG^-C5)*rF?SrlP1n4<^1OP_3sBW4@#l{

literal 0
HcmV?d00001

diff --git a/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.15.bin b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.15.bin
deleted file mode 100644
index 7adc8dd4472e6db1a91d2f326635981718ca64f2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 488
zcmbu6!4AS842FsCGZ}*dy_mg+Ct#pnT*i#b$*Yg;BJ8qchiNZ=ljdvM|EDAuy<VPl
zy!Fx36MLw0;=`I&*2F>)(w2^a=MH48Q8;TGRcmlTf(6rfXPFjSJ46(yf&k8}#9A2z
znmI2!Xw<y$b<Ex2ot2is*8BKx+`fzVFWDCU-@kVA9kXuqdG-I4(lV!EswuZB^gUVn
F_yNlzdv^c;

diff --git a/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.16.bin b/tests/unit/libstore/data/libstore/worker-protocol/valid-path-info.bin
similarity index 100%
rename from tests/unit/libstore/data/libstore/worker-protocol/valid-path-info-1.16.bin
rename to tests/unit/libstore/data/libstore/worker-protocol/valid-path-info.bin
diff --git a/tests/unit/libstore/worker-protocol.cc b/tests/unit/libstore/worker-protocol.cc
index 2d6fbd58f..f36de9cf9 100644
--- a/tests/unit/libstore/worker-protocol.cc
+++ b/tests/unit/libstore/worker-protocol.cc
@@ -18,9 +18,9 @@ struct WorkerProtoTest : VersionedProtoTest<WorkerProto, workerProtoDir>
 {
     /**
      * For serializers that don't care about the minimum version, we
-     * used the oldest one: 1.0.
+     * have to use the minimum supported to not throw an assert.
      */
-    WorkerProto::Version defaultVersion = 1 << 8 | 0;
+    WorkerProto::Version defaultVersion = MIN_SUPPORTED_WORKER_PROTO_VERSION;
 };
 
 
@@ -331,9 +331,9 @@ VERSIONED_CHARACTERIZATION_TEST(
 
 VERSIONED_CHARACTERIZATION_TEST(
     WorkerProtoTest,
-    unkeyedValidPathInfo_1_15,
-    "unkeyed-valid-path-info-1.15",
-    1 << 8 | 15,
+    unkeyedValidPathInfo,
+    "unkeyed-valid-path-info",
+    defaultVersion,
     (std::tuple<UnkeyedValidPathInfo, UnkeyedValidPathInfo> {
         ({
             UnkeyedValidPathInfo info {
@@ -363,56 +363,9 @@ VERSIONED_CHARACTERIZATION_TEST(
 
 VERSIONED_CHARACTERIZATION_TEST(
     WorkerProtoTest,
-    validPathInfo_1_15,
-    "valid-path-info-1.15",
-    1 << 8 | 15,
-    (std::tuple<ValidPathInfo, ValidPathInfo> {
-        ({
-            ValidPathInfo info {
-                StorePath {
-                    "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
-                },
-                UnkeyedValidPathInfo {
-                    Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
-                },
-            };
-            info.registrationTime = 23423;
-            info.narSize = 34878;
-            info;
-        }),
-        ({
-            ValidPathInfo info {
-                StorePath {
-                    "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
-                },
-                UnkeyedValidPathInfo {
-                    Hash::parseSRI("sha256-FePFYIlMuycIXPZbWi7LGEiMmZSX9FMbaQenWBzm1Sc="),
-                },
-            };
-            info.deriver = StorePath {
-                "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar.drv",
-            };
-            info.references = {
-                // other reference
-                StorePath {
-                    "g1w7hyyyy1w7hy3qg1w7hy3qgqqqqy3q-foo",
-                },
-                // self reference
-                StorePath {
-                    "g1w7hy3qg1w7hy3qg1w7hy3qg1w7hy3q-bar",
-                },
-            };
-            info.registrationTime = 23423;
-            info.narSize = 34878;
-            info;
-        }),
-    }))
-
-VERSIONED_CHARACTERIZATION_TEST(
-    WorkerProtoTest,
-    validPathInfo_1_16,
-    "valid-path-info-1.16",
-    1 << 8 | 16,
+    validPathInfo,
+    "valid-path-info",
+    defaultVersion,
     (std::tuple<ValidPathInfo, ValidPathInfo, ValidPathInfo> {
         ({
             ValidPathInfo info {