unittests: use current version of BOLTS when reading specs.

We check out the master bolts branch, and that recently changed test vectors causing our CI to change. We should test them against our current BOLTVERSION, which is in .tmp.lightningrfc/ Signed-off-by: Rusty Russell <[email protected]>
jgabarda · Jul 17, 2024 · 6bf41f4 · 6bf41f4
1 parent 6a98de5
commit 6bf41f4
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 9 deletions.
diff --git a/Makefile b/Makefile
@@ -752,8 +752,8 @@ $(ALL_TEST_PROGRAMS:%=update-mocks/%.c): $(ALL_GEN_HEADERS) $(EXTERNAL_LIBS) lib
 update-mocks/%: % $(ALL_GEN_HEADERS) $(ALL_GEN_SOURCES)
 	@MAKE=$(MAKE) tools/update-mocks.sh "$*" $(SUPPRESS_OUTPUT)
 
-unittest/%: %
-	$(VG) $(VG_TEST_ARGS) $* > /dev/null
+unittest/%: % bolt-precheck
+	BOLTDIR=$(LOCAL_BOLTDIR) $(VG) $(VG_TEST_ARGS) $* > /dev/null
 
 # Installation directories
 exec_prefix = $(PREFIX)

diff --git a/common/test/run-bolt12-offer-decode.c b/common/test/run-bolt12-offer-decode.c
@@ -136,7 +136,7 @@ int main(int argc, char *argv[])
 		char *dir = getenv("BOLTDIR");
 		json = grab_file(tmpctx,
 				 path_join(tmpctx,
-					   dir ? dir : "../bolts",
+					   dir ? dir : ".tmp.lightningrfc",
 					   "bolt12/offers-test.json"));
 		if (!json) {
 			printf("test file not found, skipping\n");

diff --git a/common/test/run-bolt12_decode.c b/common/test/run-bolt12_decode.c
@@ -172,7 +172,7 @@ int main(int argc, char *argv[])
 		char *dir = getenv("BOLTDIR");
 		json = grab_file(tmpctx,
 				 path_join(tmpctx,
-					   dir ? dir : "../bolts",
+					   dir ? dir : ".tmp.lightningrfc",
 					   "bolt12/format-string-test.json"));
 		if (!json) {
 			printf("test file not found, skipping\n");

diff --git a/common/test/run-bolt12_merkle-json.c b/common/test/run-bolt12_merkle-json.c
@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
 		char *dir = getenv("BOLTDIR");
 		json = grab_file(tmpctx,
 				 path_join(tmpctx,
-					   dir ? dir : "../bolts",
+					   dir ? dir : ".tmp.lightningrfc",
 					   "bolt12/merkle-test.json"));
 		if (!json) {
 			printf("test file not found, skipping\n");

diff --git a/common/test/run-bolt12_period.c b/common/test/run-bolt12_period.c
@@ -179,7 +179,7 @@ int main(int argc, char *argv[])
 		char *dir = getenv("BOLTDIR");
 		json = grab_file(tmpctx,
 				 path_join(tmpctx,
-					   dir ? dir : "../bolts",
+					   dir ? dir : ".tmp.lightningrfc",
 					   "bolt12/offer-period-test.json"));
 		if (!json) {
 			printf("test file not found, skipping\n");

diff --git a/common/test/run-onion-test-vector.c b/common/test/run-onion-test-vector.c
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
 		char *dir = getenv("BOLTDIR");
 		json = grab_file(tmpctx,
 				 path_join(tmpctx,
-					   dir ? dir : "../bolts",
+					   dir ? dir : ".tmp.lightningrfc",
 					   "bolt04/onion-test.json"));
 		if (!json) {
 			printf("test file not found, skipping\n");

diff --git a/common/test/run-route_blinding_onion_test.c b/common/test/run-route_blinding_onion_test.c
@@ -91,7 +91,7 @@ int main(int argc, char *argv[])
 		char *dir = getenv("BOLTDIR");
 		json = grab_file(tmpctx,
 				 path_join(tmpctx,
-					   dir ? dir : "../bolts",
+					   dir ? dir : ".tmp.lightningrfc",
 					   "bolt04/blinded-payment-onion-test.json"));
 		if (!json) {
 			printf("test file not found, skipping\n");

diff --git a/common/test/run-route_blinding_test.c b/common/test/run-route_blinding_test.c
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
 		char *dir = getenv("BOLTDIR");
 		json = grab_file(tmpctx,
 				 path_join(tmpctx,
-					   dir ? dir : "../bolts",
+					   dir ? dir : ".tmp.lightningrfc",
 					   "bolt04/route-blinding-test.json"));
 		if (!json) {
 			printf("test file not found, skipping\n");