Revert "Testability refactor: extract helpers, add stress/send tests, ppagecache/pfs extraction (#383)" (#384)

This reverts commit 4618e24.

Co-authored-by: Levi Neely <lkn@darkstar.example.net>

Author: lneely

Makefile

@@ -171,9 +171,7 @@ TEST_BINS := \
 	tests/test_pfstasks_tree \
 	tests/test_pfstasks_db \
 	tests/test_plocks \
-	tests/test_pfsupload \
-	tests/test_ppagecache \
-	tests/test_pfs_helpers
+	tests/test_pfsupload
 
 .PHONY: test tests check clean-tests
 
@@ -240,17 +238,6 @@ tests/test_pfsupload: $(UNIT_DIR)/test_pfsupload.c $(LIBDIR)/pfsupload_send.c $(
 	$(CC) $(TEST_CFLAGS) $(CFLAGS) -o $@ $^ \
 		-Wl,--wrap=papi_send  # redirect papi_send → __wrap_papi_send; GNU ld only (not macOS Apple ld)
 
-tests/test_ppagecache: $(UNIT_DIR)/test_ppagecache.c $(LIBDIR)/ppagecache_helpers.c $(LIBDIR)/pcrc32c.c $(LIBDIR)/pdbg.c $(LIBDIR)/pmem.c $(LIBDIR)/putil.c $(LIBDIR)/ppath.c tests/stubs/test_stubs.c
-	$(CC) $(TEST_CFLAGS) $(CFLAGS) -o $@ $^
-
-tests/test_pfs_helpers: $(UNIT_DIR)/test_pfs_helpers.c $(LIBDIR)/pfs_helpers.c $(LIBDIR)/pfstasks_tree.c $(LIBDIR)/ptree.c $(LIBDIR)/pcrc32c.c $(LIBDIR)/pdbg.c $(LIBDIR)/pmem.c $(LIBDIR)/putil.c $(LIBDIR)/ppath.c tests/stubs/test_stubs.c
-	$(CC) $(TEST_CFLAGS) $(CFLAGS) -o $@ $^ \
-		-Wl,--wrap=pfs_crpt_plain_size \
-		-Wl,--wrap=pfs_task_get_folder_tasks_rdlocked \
-		-Wl,--wrap=ptimer_time
-		# ^ GNU ld only; --wrap stubs out encrypted-size, folder-task lookup, and timer
-
-
 tests/test_read_response: $(UNIT_DIR)/test_read_response.cpp rpcclient.cpp tests/stubs/test_stubs_cpp.c
 	$(CXX) $(TEST_CXXFLAGS) $(CXXFLAGS) -o $@ $^
 

pclsync/pfs.c

@@ -63,7 +63,6 @@
 #include "pssl.h"
 #include "pstatus.h"
 #include "psys.h"
-#include "pfs_helpers.h"
 #include "ptimer.h"
 
 
@@ -3807,9 +3806,6 @@ static int pfs_do_start() {
 
   myuid = getuid();
   mygid = getgid();
-  /* Keep pfs_helpers.c in sync for helper-based callers */
-  pfs_stat_uid = myuid;
-  pfs_stat_gid = mygid;
   pthread_mutex_lock(&start_mutex);
   if (started)
     goto err00;

pclsync/pfs_helpers.c

@@ -148,7 +148,7 @@ static void check_userid(uint64_t userid, uint64_t folderid,
     do_check_userid(userid, folderid, shareid);
 }
 
-__attribute__((weak)) psync_fspath_t *pfs_fldr_resolve_path(const char *path) {
+psync_fspath_t *pfs_fldr_resolve_path(const char *path) {
   psync_fsfolderid_t cfolderid;
   const char *sl;
   psync_fstask_folder_t *folder;

pclsync/pfs_helpers.h

@@ -43,7 +43,6 @@
 #include "pmem.h"
 #include "pnetlibs.h"
 #include "ppagecache.h"
-#include "ppagecache_helpers.h"
 #include "ppath.h"
 #include "prun.h"
 #include "psettings.h"